aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.htaccess4
-rw-r--r--apps/files/ajax/delete.php7
-rw-r--r--apps/files/ajax/newfile.php9
-rw-r--r--apps/files/appinfo/application.php12
-rw-r--r--apps/files/css/files.css11
-rw-r--r--apps/files/css/upload.css2
-rw-r--r--apps/files/l10n/bg_BG.js13
-rw-r--r--apps/files/l10n/bg_BG.json13
-rw-r--r--apps/files/l10n/da.js8
-rw-r--r--apps/files/l10n/da.json8
-rw-r--r--apps/files/l10n/de.js4
-rw-r--r--apps/files/l10n/de.json4
-rw-r--r--apps/files/l10n/de_DE.js14
-rw-r--r--apps/files/l10n/de_DE.json14
-rw-r--r--apps/files/l10n/el.js1
-rw-r--r--apps/files/l10n/el.json1
-rw-r--r--apps/files/l10n/eu.js11
-rw-r--r--apps/files/l10n/eu.json11
-rw-r--r--apps/files/l10n/id.js18
-rw-r--r--apps/files/l10n/id.json18
-rw-r--r--apps/files/l10n/ja.js7
-rw-r--r--apps/files/l10n/ja.json7
-rw-r--r--apps/files/l10n/nb_NO.js2
-rw-r--r--apps/files/l10n/nb_NO.json2
-rw-r--r--apps/files/l10n/pt_PT.js9
-rw-r--r--apps/files/l10n/pt_PT.json9
-rw-r--r--apps/files/l10n/ru.js24
-rw-r--r--apps/files/l10n/ru.json24
-rw-r--r--apps/files/l10n/tr.js2
-rw-r--r--apps/files/l10n/tr.json2
-rw-r--r--apps/files/lib/helper.php19
-rw-r--r--apps/files_encryption/appinfo/info.xml3
-rw-r--r--apps/files_encryption/appinfo/register_command.php12
-rw-r--r--apps/files_encryption/appinfo/version2
-rw-r--r--apps/files_encryption/command/migratekeys.php80
-rw-r--r--apps/files_encryption/l10n/bg_BG.js2
-rw-r--r--apps/files_encryption/l10n/bg_BG.json2
-rw-r--r--apps/files_encryption/l10n/da.js7
-rw-r--r--apps/files_encryption/l10n/da.json7
-rw-r--r--apps/files_encryption/l10n/de_DE.js4
-rw-r--r--apps/files_encryption/l10n/de_DE.json4
-rw-r--r--apps/files_encryption/l10n/en_GB.js1
-rw-r--r--apps/files_encryption/l10n/en_GB.json1
-rw-r--r--apps/files_encryption/l10n/eu.js5
-rw-r--r--apps/files_encryption/l10n/eu.json5
-rw-r--r--apps/files_encryption/l10n/fr.js1
-rw-r--r--apps/files_encryption/l10n/fr.json1
-rw-r--r--apps/files_encryption/l10n/ja.js1
-rw-r--r--apps/files_encryption/l10n/ja.json1
-rw-r--r--apps/files_encryption/l10n/ko.js1
-rw-r--r--apps/files_encryption/l10n/ko.json1
-rw-r--r--apps/files_encryption/l10n/nb_NO.js1
-rw-r--r--apps/files_encryption/l10n/nb_NO.json1
-rw-r--r--apps/files_encryption/l10n/nl.js1
-rw-r--r--apps/files_encryption/l10n/nl.json1
-rw-r--r--apps/files_encryption/l10n/pl.js2
-rw-r--r--apps/files_encryption/l10n/pl.json2
-rw-r--r--apps/files_encryption/l10n/pt_PT.js2
-rw-r--r--apps/files_encryption/l10n/pt_PT.json2
-rw-r--r--apps/files_encryption/l10n/ru.js9
-rw-r--r--apps/files_encryption/l10n/ru.json9
-rw-r--r--apps/files_encryption/l10n/sk_SK.js10
-rw-r--r--apps/files_encryption/l10n/sk_SK.json10
-rw-r--r--apps/files_encryption/l10n/tr.js1
-rw-r--r--apps/files_encryption/l10n/tr.json1
-rw-r--r--apps/files_encryption/l10n/zh_CN.js8
-rw-r--r--apps/files_encryption/l10n/zh_CN.json8
-rw-r--r--apps/files_encryption/lib/helper.php4
-rw-r--r--apps/files_encryption/lib/migration.php61
-rw-r--r--apps/files_encryption/lib/util.php2
-rw-r--r--apps/files_encryption/tests/helper.php1
-rwxr-xr-xapps/files_encryption/tests/share.php173
-rwxr-xr-xapps/files_encryption/tests/trashbin.php2
-rw-r--r--apps/files_external/css/settings.css8
-rw-r--r--apps/files_external/l10n/bg_BG.js2
-rw-r--r--apps/files_external/l10n/bg_BG.json2
-rw-r--r--apps/files_external/l10n/de.js4
-rw-r--r--apps/files_external/l10n/de.json4
-rw-r--r--apps/files_external/l10n/de_DE.js6
-rw-r--r--apps/files_external/l10n/de_DE.json6
-rw-r--r--apps/files_external/l10n/el.js2
-rw-r--r--apps/files_external/l10n/el.json2
-rw-r--r--apps/files_external/l10n/es.js12
-rw-r--r--apps/files_external/l10n/es.json12
-rw-r--r--apps/files_external/l10n/eu.js3
-rw-r--r--apps/files_external/l10n/eu.json3
-rw-r--r--apps/files_external/l10n/ja.js5
-rw-r--r--apps/files_external/l10n/ja.json5
-rw-r--r--apps/files_external/l10n/nb_NO.js1
-rw-r--r--apps/files_external/l10n/nb_NO.json1
-rw-r--r--apps/files_external/l10n/ru.js14
-rw-r--r--apps/files_external/l10n/ru.json14
-rw-r--r--apps/files_external/l10n/sk_SK.js5
-rw-r--r--apps/files_external/l10n/sk_SK.json5
-rw-r--r--apps/files_external/lib/config.php31
-rw-r--r--apps/files_external/tests/mountconfig.php74
-rw-r--r--apps/files_sharing/ajax/external.php62
-rw-r--r--apps/files_sharing/ajax/list.php5
-rw-r--r--apps/files_sharing/ajax/testremote.php1
-rw-r--r--apps/files_sharing/api/server2server.php13
-rw-r--r--apps/files_sharing/application.php6
-rw-r--r--apps/files_sharing/js/external.js8
-rw-r--r--apps/files_sharing/js/share.js2
-rw-r--r--apps/files_sharing/l10n/bg_BG.js16
-rw-r--r--apps/files_sharing/l10n/bg_BG.json16
-rw-r--r--apps/files_sharing/l10n/cs_CZ.js4
-rw-r--r--apps/files_sharing/l10n/cs_CZ.json4
-rw-r--r--apps/files_sharing/l10n/da.js14
-rw-r--r--apps/files_sharing/l10n/da.json14
-rw-r--r--apps/files_sharing/l10n/de.js12
-rw-r--r--apps/files_sharing/l10n/de.json12
-rw-r--r--apps/files_sharing/l10n/de_DE.js18
-rw-r--r--apps/files_sharing/l10n/de_DE.json18
-rw-r--r--apps/files_sharing/l10n/el.js18
-rw-r--r--apps/files_sharing/l10n/el.json18
-rw-r--r--apps/files_sharing/l10n/en_GB.js4
-rw-r--r--apps/files_sharing/l10n/en_GB.json4
-rw-r--r--apps/files_sharing/l10n/es.js4
-rw-r--r--apps/files_sharing/l10n/es.json4
-rw-r--r--apps/files_sharing/l10n/et_EE.js1
-rw-r--r--apps/files_sharing/l10n/et_EE.json1
-rw-r--r--apps/files_sharing/l10n/eu.js18
-rw-r--r--apps/files_sharing/l10n/eu.json18
-rw-r--r--apps/files_sharing/l10n/fi_FI.js4
-rw-r--r--apps/files_sharing/l10n/fi_FI.json4
-rw-r--r--apps/files_sharing/l10n/fr.js4
-rw-r--r--apps/files_sharing/l10n/fr.json4
-rw-r--r--apps/files_sharing/l10n/gl.js4
-rw-r--r--apps/files_sharing/l10n/gl.json4
-rw-r--r--apps/files_sharing/l10n/id.js27
-rw-r--r--apps/files_sharing/l10n/id.json27
-rw-r--r--apps/files_sharing/l10n/it.js6
-rw-r--r--apps/files_sharing/l10n/it.json6
-rw-r--r--apps/files_sharing/l10n/ja.js5
-rw-r--r--apps/files_sharing/l10n/ja.json5
-rw-r--r--apps/files_sharing/l10n/ko.js4
-rw-r--r--apps/files_sharing/l10n/ko.json4
-rw-r--r--apps/files_sharing/l10n/nb_NO.js1
-rw-r--r--apps/files_sharing/l10n/nb_NO.json1
-rw-r--r--apps/files_sharing/l10n/nl.js4
-rw-r--r--apps/files_sharing/l10n/nl.json4
-rw-r--r--apps/files_sharing/l10n/pt_BR.js4
-rw-r--r--apps/files_sharing/l10n/pt_BR.json4
-rw-r--r--apps/files_sharing/l10n/pt_PT.js15
-rw-r--r--apps/files_sharing/l10n/pt_PT.json15
-rw-r--r--apps/files_sharing/l10n/ru.js6
-rw-r--r--apps/files_sharing/l10n/ru.json6
-rw-r--r--apps/files_sharing/l10n/sk_SK.js6
-rw-r--r--apps/files_sharing/l10n/sk_SK.json6
-rw-r--r--apps/files_sharing/l10n/sl.js1
-rw-r--r--apps/files_sharing/l10n/sl.json1
-rw-r--r--apps/files_sharing/l10n/sr@latin.js1
-rw-r--r--apps/files_sharing/l10n/sr@latin.json1
-rw-r--r--apps/files_sharing/l10n/sv.js1
-rw-r--r--apps/files_sharing/l10n/sv.json1
-rw-r--r--apps/files_sharing/l10n/tr.js4
-rw-r--r--apps/files_sharing/l10n/tr.json4
-rw-r--r--apps/files_sharing/l10n/uk.js1
-rw-r--r--apps/files_sharing/l10n/uk.json1
-rw-r--r--apps/files_sharing/lib/controllers/sharecontroller.php1
-rw-r--r--apps/files_sharing/lib/external/manager.php78
-rw-r--r--apps/files_sharing/lib/external/scanner.php53
-rw-r--r--apps/files_sharing/lib/external/storage.php58
-rw-r--r--apps/files_sharing/lib/hooks.php4
-rw-r--r--apps/files_sharing/templates/settings-admin.php2
-rw-r--r--apps/files_sharing/tests/js/externalSpec.js122
-rw-r--r--apps/files_sharing/tests/js/shareSpec.js26
-rw-r--r--apps/files_sharing/tests/server2server.php5
-rw-r--r--apps/files_sharing/tests/sharedstorage.php2
-rw-r--r--apps/files_sharing/tests/updater.php2
-rw-r--r--apps/files_trashbin/l10n/bg_BG.js4
-rw-r--r--apps/files_trashbin/l10n/bg_BG.json4
-rw-r--r--apps/files_trashbin/l10n/el.js1
-rw-r--r--apps/files_trashbin/l10n/el.json1
-rw-r--r--apps/files_trashbin/l10n/eu.js4
-rw-r--r--apps/files_trashbin/l10n/eu.json4
-rw-r--r--apps/files_trashbin/l10n/id.js5
-rw-r--r--apps/files_trashbin/l10n/id.json5
-rw-r--r--apps/files_trashbin/l10n/pt_PT.js1
-rw-r--r--apps/files_trashbin/l10n/pt_PT.json1
-rw-r--r--apps/files_trashbin/l10n/ru.js2
-rw-r--r--apps/files_trashbin/l10n/ru.json2
-rw-r--r--apps/files_trashbin/l10n/sk_SK.js4
-rw-r--r--apps/files_trashbin/l10n/sk_SK.json4
-rw-r--r--apps/files_trashbin/lib/storage.php47
-rw-r--r--apps/files_trashbin/lib/trashbin.php12
-rw-r--r--apps/files_trashbin/tests/storage.php209
-rw-r--r--apps/files_trashbin/tests/trashbin.php2
-rw-r--r--apps/files_versions/l10n/ar.js6
-rw-r--r--apps/files_versions/l10n/ar.json6
-rw-r--r--apps/provisioning_api/appinfo/info.xml4
-rw-r--r--apps/user_ldap/appinfo/info.xml3
-rw-r--r--apps/user_ldap/appinfo/update.php48
-rw-r--r--apps/user_ldap/appinfo/version2
-rw-r--r--apps/user_ldap/l10n/ar.js1
-rw-r--r--apps/user_ldap/l10n/ar.json1
-rw-r--r--apps/user_ldap/l10n/de.js8
-rw-r--r--apps/user_ldap/l10n/de.json8
-rw-r--r--apps/user_ldap/l10n/de_DE.js6
-rw-r--r--apps/user_ldap/l10n/de_DE.json6
-rw-r--r--apps/user_ldap/l10n/eu.js4
-rw-r--r--apps/user_ldap/l10n/eu.json4
-rw-r--r--apps/user_ldap/l10n/fr.js2
-rw-r--r--apps/user_ldap/l10n/fr.json2
-rw-r--r--apps/user_ldap/l10n/id.js4
-rw-r--r--apps/user_ldap/l10n/id.json4
-rw-r--r--apps/user_ldap/l10n/ja.js12
-rw-r--r--apps/user_ldap/l10n/ja.json12
-rw-r--r--apps/user_ldap/l10n/pl.js1
-rw-r--r--apps/user_ldap/l10n/pl.json1
-rw-r--r--apps/user_ldap/l10n/pt_PT.js1
-rw-r--r--apps/user_ldap/l10n/pt_PT.json1
-rw-r--r--apps/user_ldap/l10n/ru.js68
-rw-r--r--apps/user_ldap/l10n/ru.json68
-rw-r--r--apps/user_ldap/l10n/sk_SK.js1
-rw-r--r--apps/user_ldap/l10n/sk_SK.json1
-rw-r--r--apps/user_ldap/lib/connection.php2
-rw-r--r--apps/user_webdavauth/l10n/da.js2
-rw-r--r--apps/user_webdavauth/l10n/da.json2
-rw-r--r--apps/user_webdavauth/l10n/fr.js2
-rw-r--r--apps/user_webdavauth/l10n/fr.json2
-rw-r--r--config/.htaccess4
-rw-r--r--core/command/app/disable.php8
-rw-r--r--core/command/db/converttype.php18
-rw-r--r--core/js/share.js3
-rw-r--r--core/js/tests/specs/shareSpec.js6
-rw-r--r--core/l10n/ar.js20
-rw-r--r--core/l10n/ar.json20
-rw-r--r--core/l10n/ast.js1
-rw-r--r--core/l10n/ast.json1
-rw-r--r--core/l10n/bg_BG.js128
-rw-r--r--core/l10n/bg_BG.json128
-rw-r--r--core/l10n/bs.js1
-rw-r--r--core/l10n/bs.json1
-rw-r--r--core/l10n/ca.js1
-rw-r--r--core/l10n/ca.json1
-rw-r--r--core/l10n/cs_CZ.js5
-rw-r--r--core/l10n/cs_CZ.json5
-rw-r--r--core/l10n/da.js13
-rw-r--r--core/l10n/da.json13
-rw-r--r--core/l10n/de.js37
-rw-r--r--core/l10n/de.json37
-rw-r--r--core/l10n/de_AT.js1
-rw-r--r--core/l10n/de_AT.json1
-rw-r--r--core/l10n/de_DE.js11
-rw-r--r--core/l10n/de_DE.json11
-rw-r--r--core/l10n/el.js1
-rw-r--r--core/l10n/el.json1
-rw-r--r--core/l10n/en_GB.js1
-rw-r--r--core/l10n/en_GB.json1
-rw-r--r--core/l10n/es.js4
-rw-r--r--core/l10n/es.json4
-rw-r--r--core/l10n/et_EE.js1
-rw-r--r--core/l10n/et_EE.json1
-rw-r--r--core/l10n/eu.js22
-rw-r--r--core/l10n/eu.json22
-rw-r--r--core/l10n/fi_FI.js5
-rw-r--r--core/l10n/fi_FI.json5
-rw-r--r--core/l10n/fr.js5
-rw-r--r--core/l10n/fr.json5
-rw-r--r--core/l10n/gl.js5
-rw-r--r--core/l10n/gl.json5
-rw-r--r--core/l10n/hr.js3
-rw-r--r--core/l10n/hr.json3
-rw-r--r--core/l10n/hu_HU.js1
-rw-r--r--core/l10n/hu_HU.json1
-rw-r--r--core/l10n/id.js50
-rw-r--r--core/l10n/id.json50
-rw-r--r--core/l10n/it.js5
-rw-r--r--core/l10n/it.json5
-rw-r--r--core/l10n/ja.js15
-rw-r--r--core/l10n/ja.json15
-rw-r--r--core/l10n/ko.js5
-rw-r--r--core/l10n/ko.json5
-rw-r--r--core/l10n/nb_NO.js2
-rw-r--r--core/l10n/nb_NO.json2
-rw-r--r--core/l10n/nl.js5
-rw-r--r--core/l10n/nl.json5
-rw-r--r--core/l10n/pl.js1
-rw-r--r--core/l10n/pl.json1
-rw-r--r--core/l10n/pt_BR.js5
-rw-r--r--core/l10n/pt_BR.json5
-rw-r--r--core/l10n/pt_PT.js12
-rw-r--r--core/l10n/pt_PT.json12
-rw-r--r--core/l10n/ru.js44
-rw-r--r--core/l10n/ru.json44
-rw-r--r--core/l10n/sk_SK.js27
-rw-r--r--core/l10n/sk_SK.json27
-rw-r--r--core/l10n/sl.js1
-rw-r--r--core/l10n/sl.json1
-rw-r--r--core/l10n/sq.js1
-rw-r--r--core/l10n/sq.json1
-rw-r--r--core/l10n/sr@latin.js1
-rw-r--r--core/l10n/sr@latin.json1
-rw-r--r--core/l10n/sv.js4
-rw-r--r--core/l10n/sv.json4
-rw-r--r--core/l10n/tr.js4
-rw-r--r--core/l10n/tr.json4
-rw-r--r--core/l10n/uk.js1
-rw-r--r--core/l10n/uk.json1
-rw-r--r--core/l10n/zh_CN.js3
-rw-r--r--core/l10n/zh_CN.json3
-rw-r--r--core/l10n/zh_TW.js1
-rw-r--r--core/l10n/zh_TW.json1
-rw-r--r--core/lostpassword/controller/lostcontroller.php4
-rw-r--r--core/templates/exception.php2
-rw-r--r--core/templates/installation.php7
-rw-r--r--core/templates/layout.base.php4
-rw-r--r--core/templates/layout.guest.php4
-rw-r--r--core/templates/layout.user.php4
-rw-r--r--index.php8
-rw-r--r--lib/l10n/ast.js2
-rw-r--r--lib/l10n/ast.json2
-rw-r--r--lib/l10n/bg_BG.js20
-rw-r--r--lib/l10n/bg_BG.json20
-rw-r--r--lib/l10n/bs.js4
-rw-r--r--lib/l10n/bs.json4
-rw-r--r--lib/l10n/ca.js2
-rw-r--r--lib/l10n/ca.json2
-rw-r--r--lib/l10n/cs_CZ.js4
-rw-r--r--lib/l10n/cs_CZ.json4
-rw-r--r--lib/l10n/da.js4
-rw-r--r--lib/l10n/da.json4
-rw-r--r--lib/l10n/de.js6
-rw-r--r--lib/l10n/de.json6
-rw-r--r--lib/l10n/de_DE.js42
-rw-r--r--lib/l10n/de_DE.json42
-rw-r--r--lib/l10n/el.js2
-rw-r--r--lib/l10n/el.json2
-rw-r--r--lib/l10n/en_GB.js4
-rw-r--r--lib/l10n/en_GB.json4
-rw-r--r--lib/l10n/es.js4
-rw-r--r--lib/l10n/es.json4
-rw-r--r--lib/l10n/et_EE.js2
-rw-r--r--lib/l10n/et_EE.json2
-rw-r--r--lib/l10n/eu.js21
-rw-r--r--lib/l10n/eu.json21
-rw-r--r--lib/l10n/fi_FI.js5
-rw-r--r--lib/l10n/fi_FI.json5
-rw-r--r--lib/l10n/fr.js10
-rw-r--r--lib/l10n/fr.json10
-rw-r--r--lib/l10n/gl.js4
-rw-r--r--lib/l10n/gl.json4
-rw-r--r--lib/l10n/hr.js2
-rw-r--r--lib/l10n/hr.json2
-rw-r--r--lib/l10n/hu_HU.js2
-rw-r--r--lib/l10n/hu_HU.json2
-rw-r--r--lib/l10n/id.js20
-rw-r--r--lib/l10n/id.json20
-rw-r--r--lib/l10n/it.js4
-rw-r--r--lib/l10n/it.json4
-rw-r--r--lib/l10n/ja.js4
-rw-r--r--lib/l10n/ja.json4
-rw-r--r--lib/l10n/ko.js4
-rw-r--r--lib/l10n/ko.json4
-rw-r--r--lib/l10n/nb_NO.js2
-rw-r--r--lib/l10n/nb_NO.json2
-rw-r--r--lib/l10n/nl.js4
-rw-r--r--lib/l10n/nl.json4
-rw-r--r--lib/l10n/pl.js2
-rw-r--r--lib/l10n/pl.json2
-rw-r--r--lib/l10n/pt_BR.js3
-rw-r--r--lib/l10n/pt_BR.json3
-rw-r--r--lib/l10n/pt_PT.js20
-rw-r--r--lib/l10n/pt_PT.json20
-rw-r--r--lib/l10n/ru.js46
-rw-r--r--lib/l10n/ru.json46
-rw-r--r--lib/l10n/sk_SK.js40
-rw-r--r--lib/l10n/sk_SK.json40
-rw-r--r--lib/l10n/sv.js2
-rw-r--r--lib/l10n/sv.json2
-rw-r--r--lib/l10n/tr.js4
-rw-r--r--lib/l10n/tr.json4
-rw-r--r--lib/l10n/uk.js2
-rw-r--r--lib/l10n/uk.json2
-rw-r--r--lib/l10n/zh_CN.js2
-rw-r--r--lib/l10n/zh_CN.json2
-rw-r--r--lib/private/allconfig.php11
-rw-r--r--lib/private/app.php3
-rw-r--r--lib/private/app/appmanager.php4
-rw-r--r--lib/private/app/platformrepository.php5
-rw-r--r--lib/private/appframework/dependencyinjection/dicontainer.php2
-rw-r--r--lib/private/config.php93
-rw-r--r--lib/private/connector/sabre/file.php21
-rw-r--r--lib/private/connector/sabre/filesplugin.php4
-rw-r--r--lib/private/connector/sabre/node.php16
-rw-r--r--lib/private/connector/sabre/objecttree.php4
-rw-r--r--lib/private/files/cache/cache.php3
-rw-r--r--lib/private/files/cache/homecache.php1
-rw-r--r--lib/private/files/filesystem.php29
-rw-r--r--lib/private/files/mapper.php18
-rw-r--r--lib/private/files/mount/mountpoint.php21
-rw-r--r--lib/private/files/node/node.php3
-rw-r--r--lib/private/files/node/root.php2
-rw-r--r--lib/private/files/storage/dav.php63
-rw-r--r--lib/private/files/storage/storagefactory.php30
-rw-r--r--lib/private/files/view.php63
-rw-r--r--lib/private/installer.php2
-rw-r--r--lib/private/legacy/config.php10
-rw-r--r--lib/private/repair.php2
-rw-r--r--lib/private/search/result/file.php2
-rw-r--r--lib/private/security/certificatemanager.php42
-rw-r--r--lib/private/server.php13
-rw-r--r--lib/private/setup.php23
-rw-r--r--lib/private/setup/abstractdatabase.php34
-rw-r--r--lib/private/setup/mssql.php8
-rw-r--r--lib/private/setup/mysql.php6
-rw-r--r--lib/private/setup/oci.php52
-rw-r--r--lib/private/setup/postgresql.php19
-rw-r--r--lib/private/share/share.php37
-rw-r--r--lib/private/systemconfig.php10
-rw-r--r--lib/private/templatelayout.php6
-rw-r--r--lib/private/util.php3
-rw-r--r--lib/public/files/node.php2
-rw-r--r--lib/public/files/storage/istoragefactory.php2
-rw-r--r--lib/public/iconfig.php8
-rw-r--r--lib/repair/enablefilesapp.php50
-rw-r--r--settings/application.php11
-rw-r--r--settings/controller/appsettingscontroller.php20
-rw-r--r--settings/controller/mailsettingscontroller.php21
-rw-r--r--settings/controller/userscontroller.php118
-rw-r--r--settings/css/settings.css5
-rw-r--r--settings/factory/subadminfactory.php45
-rw-r--r--settings/js/admin.js4
-rw-r--r--settings/js/users/users.js24
-rw-r--r--settings/l10n/ast.js1
-rw-r--r--settings/l10n/ast.json1
-rw-r--r--settings/l10n/bg_BG.js131
-rw-r--r--settings/l10n/bg_BG.json131
-rw-r--r--settings/l10n/bs.js1
-rw-r--r--settings/l10n/bs.json1
-rw-r--r--settings/l10n/ca.js1
-rw-r--r--settings/l10n/ca.json1
-rw-r--r--settings/l10n/cs_CZ.js5
-rw-r--r--settings/l10n/cs_CZ.json5
-rw-r--r--settings/l10n/da.js22
-rw-r--r--settings/l10n/da.json22
-rw-r--r--settings/l10n/de.js13
-rw-r--r--settings/l10n/de.json13
-rw-r--r--settings/l10n/de_DE.js19
-rw-r--r--settings/l10n/de_DE.json19
-rw-r--r--settings/l10n/el.js1
-rw-r--r--settings/l10n/el.json1
-rw-r--r--settings/l10n/en_GB.js2
-rw-r--r--settings/l10n/en_GB.json2
-rw-r--r--settings/l10n/es.js5
-rw-r--r--settings/l10n/es.json5
-rw-r--r--settings/l10n/et_EE.js1
-rw-r--r--settings/l10n/et_EE.json1
-rw-r--r--settings/l10n/eu.js48
-rw-r--r--settings/l10n/eu.json48
-rw-r--r--settings/l10n/fi_FI.js5
-rw-r--r--settings/l10n/fi_FI.json5
-rw-r--r--settings/l10n/fr.js10
-rw-r--r--settings/l10n/fr.json10
-rw-r--r--settings/l10n/gl.js27
-rw-r--r--settings/l10n/gl.json27
-rw-r--r--settings/l10n/hr.js1
-rw-r--r--settings/l10n/hr.json1
-rw-r--r--settings/l10n/hu_HU.js1
-rw-r--r--settings/l10n/hu_HU.json1
-rw-r--r--settings/l10n/id.js40
-rw-r--r--settings/l10n/id.json40
-rw-r--r--settings/l10n/it.js5
-rw-r--r--settings/l10n/it.json5
-rw-r--r--settings/l10n/ja.js10
-rw-r--r--settings/l10n/ja.json10
-rw-r--r--settings/l10n/ko.js8
-rw-r--r--settings/l10n/ko.json8
-rw-r--r--settings/l10n/mn.js1
-rw-r--r--settings/l10n/mn.json1
-rw-r--r--settings/l10n/nb_NO.js5
-rw-r--r--settings/l10n/nb_NO.json5
-rw-r--r--settings/l10n/nl.js8
-rw-r--r--settings/l10n/nl.json8
-rw-r--r--settings/l10n/pl.js35
-rw-r--r--settings/l10n/pl.json35
-rw-r--r--settings/l10n/pt_BR.js5
-rw-r--r--settings/l10n/pt_BR.json5
-rw-r--r--settings/l10n/pt_PT.js5
-rw-r--r--settings/l10n/pt_PT.json5
-rw-r--r--settings/l10n/ru.js114
-rw-r--r--settings/l10n/ru.json114
-rw-r--r--settings/l10n/si_LK.js1
-rw-r--r--settings/l10n/si_LK.json1
-rw-r--r--settings/l10n/sk_SK.js38
-rw-r--r--settings/l10n/sk_SK.json38
-rw-r--r--settings/l10n/sv.js3
-rw-r--r--settings/l10n/sv.json3
-rw-r--r--settings/l10n/tr.js10
-rw-r--r--settings/l10n/tr.json10
-rw-r--r--settings/l10n/uk.js1
-rw-r--r--settings/l10n/uk.json1
-rw-r--r--settings/l10n/zh_CN.js1
-rw-r--r--settings/l10n/zh_CN.json1
-rw-r--r--settings/middleware/subadminmiddleware.php4
-rw-r--r--settings/templates/admin.php14
-rw-r--r--tests/core/lostpassword/controller/lostcontrollertest.php64
-rw-r--r--tests/lib/config.php30
-rw-r--r--tests/lib/connector/sabre/file.php25
-rw-r--r--tests/lib/files/filesystem.php22
-rw-r--r--tests/lib/files/mapper.php9
-rw-r--r--tests/lib/files/mount/mountpoint.php69
-rw-r--r--tests/lib/files/node/integration.php4
-rw-r--r--tests/lib/files/view.php90
-rw-r--r--tests/lib/security/certificatemanager.php8
-rw-r--r--tests/settings/controller/logsettingscontrollertest.php1
-rw-r--r--tests/settings/controller/mailsettingscontrollertest.php63
-rw-r--r--tests/settings/controller/userscontrollertest.php793
-rw-r--r--tests/settings/middleware/subadminmiddlewaretest.php6
-rw-r--r--version.php4
511 files changed, 5526 insertions, 1833 deletions
diff --git a/.htaccess b/.htaccess
index 962e969d59c..78e6255c878 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,7 +13,7 @@ php_value post_max_size 513M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
-<IfModule env_module>
+<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
</IfModule>
@@ -34,7 +34,7 @@ RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
</IfModule>
-<IfModule dir_module>
+<IfModule mod_dir.c>
DirectoryIndex index.php index.html
</IfModule>
AddDefaultCharset utf-8
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 61caa7618da..1a810f6954c 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -36,7 +36,12 @@ foreach ($files as $file) {
}
// get array with updated storage stats (e.g. max file size) after upload
-$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+try {
+ $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+} catch(\OCP\Files\NotFoundException $e) {
+ OCP\JSON::error(['data' => ['message' => 'File not found']]);
+ return;
+}
if ($success) {
OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 0eb144aca56..159a8b5d7a3 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -3,9 +3,8 @@
// Init owncloud
global $eventSource;
-if(!OC_User::isLoggedIn()) {
- exit;
-}
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::callCheck();
\OC::$server->getSession()->close();
@@ -17,8 +16,6 @@ $source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
if($source) {
$eventSource = \OC::$server->createEventSource();
-} else {
- OC_JSON::callCheck();
}
function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
@@ -138,7 +135,7 @@ if($source) {
}
}
}
- $result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
+ $result = \OC\Files\Filesystem::file_put_contents($target, $sourceStream);
}
if($result) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
diff --git a/apps/files/appinfo/application.php b/apps/files/appinfo/application.php
index 13ff60daf89..5203946f827 100644
--- a/apps/files/appinfo/application.php
+++ b/apps/files/appinfo/application.php
@@ -19,7 +19,6 @@ class Application extends App {
parent::__construct('files', $urlParams);
$container = $this->getContainer();
-
/**
* Controllers
*/
@@ -52,16 +51,5 @@ class Application extends App {
$homeFolder
);
});
-
- /**
- * Controllers
- */
- $container->registerService('APIController', function (IContainer $c) {
- return new ApiController(
- $c->query('AppName'),
- $c->query('Request'),
- $c->query('TagService')
- );
- });
}
}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f04d6f8352a..1d6b4ad9e07 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -13,6 +13,11 @@
}
.actions.hidden { display: none; }
+.actions.creatable {
+ position: relative;
+ z-index: -30;
+}
+
#new {
z-index: 1010;
float: left;
@@ -34,19 +39,21 @@
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-bottom: none;
+ background: #f8f8f8;
}
#new > ul {
display: none;
position: fixed;
min-width: 112px;
- z-index: 10;
+ z-index: -10;
padding: 8px;
padding-bottom: 0;
- margin-top: 14px;
+ margin-top: 13.5px;
margin-left: -1px;
text-align: left;
background: #f8f8f8;
border: 1px solid #ddd;
+ border: 1px solid rgba(190, 190, 190, 0.901961);
border-radius: 5px;
border-top-left-radius: 0;
box-shadow: 0 2px 7px rgba(170,170,170,.4);
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index adf1e9d13f8..bd60f831388 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -8,6 +8,8 @@
margin-left: 3px;
overflow: hidden;
vertical-align: top;
+ position: relative;
+ z-index: -20;
}
#upload .icon-upload {
position: relative;
diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index b7fc758007c..1d9417b154e 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -53,7 +53,9 @@ OC.L10N.register(
"Disconnect storage" : "Извади дисковото устройство.",
"Unshare" : "Премахни Споделяне",
"Download" : "Изтегли",
+ "Select" : "Избери",
"Pending" : "Чакащо",
+ "Unable to determine date" : "Неуспешно установяване на дата",
"Error moving file." : "Грешка при местенето на файла.",
"Error moving file" : "Грешка при преместването на файла.",
"Error" : "Грешка",
@@ -72,8 +74,9 @@ OC.L10N.register(
"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." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
"{dirs} and {files}" : "{dirs} и {files}",
+ "Favorited" : "Отбелязано в любими",
"Favorite" : "Любими",
"%s could not be renamed as it has been deleted" : "%s не може да бъде преименуван, защото е вече изтрит",
"%s could not be renamed" : "%s не може да бъде преименуван.",
@@ -93,9 +96,15 @@ OC.L10N.register(
"From link" : "От връзка",
"Upload" : "Качване",
"Cancel upload" : "Отказване на качването",
+ "No files yet" : "Все още няма файлове",
+ "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"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." : "Файловете се сканирват, изчакайте.",
- "Currently scanning" : "В момента се търси"
+ "Currently scanning" : "В момента се търси",
+ "No favorites" : "Няма любими",
+ "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index 05871b7f863..d8835e4e55f 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -51,7 +51,9 @@
"Disconnect storage" : "Извади дисковото устройство.",
"Unshare" : "Премахни Споделяне",
"Download" : "Изтегли",
+ "Select" : "Избери",
"Pending" : "Чакащо",
+ "Unable to determine date" : "Неуспешно установяване на дата",
"Error moving file." : "Грешка при местенето на файла.",
"Error moving file" : "Грешка при преместването на файла.",
"Error" : "Грешка",
@@ -70,8 +72,9 @@
"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." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
"{dirs} and {files}" : "{dirs} и {files}",
+ "Favorited" : "Отбелязано в любими",
"Favorite" : "Любими",
"%s could not be renamed as it has been deleted" : "%s не може да бъде преименуван, защото е вече изтрит",
"%s could not be renamed" : "%s не може да бъде преименуван.",
@@ -91,9 +94,15 @@
"From link" : "От връзка",
"Upload" : "Качване",
"Cancel upload" : "Отказване на качването",
+ "No files yet" : "Все още няма файлове",
+ "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"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." : "Файловете се сканирват, изчакайте.",
- "Currently scanning" : "В момента се търси"
+ "Currently scanning" : "В момента се търси",
+ "No favorites" : "Няма любими",
+ "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index 41f59de71b2..80ca71ef04d 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -77,7 +77,7 @@ OC.L10N.register(
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
"_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
"{dirs} and {files}" : "{dirs} og {files}",
- "Favorited" : "Gjort til favorit",
+ "Favorited" : "Gjort til foretrukken",
"Favorite" : "Foretrukken",
"%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet",
"%s could not be renamed" : "%s kunne ikke omdøbes",
@@ -104,8 +104,8 @@ OC.L10N.register(
"Upload too large" : "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
- "Currently scanning" : "Indlæser",
- "No favorites" : "Ingen favoritter",
- "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som favoritter, vil blive vist her"
+ "Currently scanning" : "Skanning er i gang",
+ "No favorites" : "Ingen foretrukne",
+ "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 0b93a3fa8a3..27a70fa59c3 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -75,7 +75,7 @@
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
"_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
"{dirs} and {files}" : "{dirs} og {files}",
- "Favorited" : "Gjort til favorit",
+ "Favorited" : "Gjort til foretrukken",
"Favorite" : "Foretrukken",
"%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet",
"%s could not be renamed" : "%s kunne ikke omdøbes",
@@ -102,8 +102,8 @@
"Upload too large" : "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
- "Currently scanning" : "Indlæser",
- "No favorites" : "Ingen favoritter",
- "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som favoritter, vil blive vist her"
+ "Currently scanning" : "Skanning er i gang",
+ "No favorites" : "Ingen foretrukne",
+ "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 1559fe5c03a..7fa9cd9af28 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -26,7 +26,7 @@ OC.L10N.register(
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
"The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
- "No file was uploaded" : "Keine Datei konnte übertragen werden.",
+ "No file was uploaded" : "Es wurde keine Datei hochgeladen",
"Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
"Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" : "Nicht genug Speicher vorhanden.",
@@ -67,7 +67,7 @@ OC.L10N.register(
"Modified" : "Geändert",
"_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
"_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
- "You don’t have permission to upload or create files here" : "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
+ "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
"_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
"\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
"Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index fd9b6260d6d..e37d96abd2e 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -24,7 +24,7 @@
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
"The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
- "No file was uploaded" : "Keine Datei konnte übertragen werden.",
+ "No file was uploaded" : "Es wurde keine Datei hochgeladen",
"Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
"Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" : "Nicht genug Speicher vorhanden.",
@@ -65,7 +65,7 @@
"Modified" : "Geändert",
"_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
"_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
- "You don’t have permission to upload or create files here" : "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
+ "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
"_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
"\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
"Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 5ea57cdc70c..9d864bf3626 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -10,23 +10,23 @@ OC.L10N.register(
"File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
"\"%s\" is an invalid file name." : "\"%s\" ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
- "The target folder has been moved or deleted." : "Der Ziel-Ordner wurde verschoben oder gelöscht.",
+ "The target folder has been moved or deleted." : "Der Zielordner wurde verschoben oder gelöscht.",
"The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
"Not a valid source" : "Keine gültige Quelle",
"Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
"The file exceeds your quota by %s" : "Die Datei überschreitet Ihr Limit um %s",
"Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s",
"Error when creating the file" : "Fehler beim Erstellen der Datei",
- "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.",
+ "Folder name cannot be empty." : "Der Ordnername darf nicht leer sein.",
"Error when creating the folder" : "Fehler beim Erstellen des Ordners",
"Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
"Invalid Token" : "Ungültiges Merkmal",
"No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler",
"There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
- "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
+ "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize-Vorgabe in php.ini",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE-Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
"The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
- "No file was uploaded" : "Keine Datei konnte übertragen werden.",
+ "No file was uploaded" : "Es wurde keine Datei hochgeladen",
"Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
"Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" : "Nicht genug Speicher vorhanden.",
@@ -67,9 +67,9 @@ OC.L10N.register(
"Modified" : "Geändert",
"_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
"_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
- "You don’t have permission to upload or create files here" : "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
+ "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
"_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
- "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
+ "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.",
"Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 2ecb290e61c..bc2fd5acddd 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -8,23 +8,23 @@
"File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
"\"%s\" is an invalid file name." : "\"%s\" ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
- "The target folder has been moved or deleted." : "Der Ziel-Ordner wurde verschoben oder gelöscht.",
+ "The target folder has been moved or deleted." : "Der Zielordner wurde verschoben oder gelöscht.",
"The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
"Not a valid source" : "Keine gültige Quelle",
"Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
"The file exceeds your quota by %s" : "Die Datei überschreitet Ihr Limit um %s",
"Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s",
"Error when creating the file" : "Fehler beim Erstellen der Datei",
- "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.",
+ "Folder name cannot be empty." : "Der Ordnername darf nicht leer sein.",
"Error when creating the folder" : "Fehler beim Erstellen des Ordners",
"Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
"Invalid Token" : "Ungültiges Merkmal",
"No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler",
"There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
- "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
+ "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize-Vorgabe in php.ini",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist größer, als die MAX_FILE_SIZE-Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
"The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
- "No file was uploaded" : "Keine Datei konnte übertragen werden.",
+ "No file was uploaded" : "Es wurde keine Datei hochgeladen",
"Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
"Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" : "Nicht genug Speicher vorhanden.",
@@ -65,9 +65,9 @@
"Modified" : "Geändert",
"_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
"_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
- "You don’t have permission to upload or create files here" : "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
+ "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
"_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
- "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
+ "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.",
"Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index 6073f6d2783..02cfa856af1 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -94,6 +94,7 @@ OC.L10N.register(
"From link" : "Από σύνδεσμο",
"Upload" : "Μεταφόρτωση",
"Cancel upload" : "Ακύρωση μεταφόρτωσης",
+ "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
"Select all" : "Επιλογή όλων",
"Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index 9d8a9d0ec8d..5f2ecf6c2a3 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -92,6 +92,7 @@
"From link" : "Από σύνδεσμο",
"Upload" : "Μεταφόρτωση",
"Cancel upload" : "Ακύρωση μεταφόρτωσης",
+ "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
"Select all" : "Επιλογή όλων",
"Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index b1f60461345..0db6c61e466 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -55,11 +55,13 @@ OC.L10N.register(
"Download" : "Deskargatu",
"Select" : "hautatu",
"Pending" : "Zain",
+ "Unable to determine date" : "Ezin izan da data zehaztu",
"Error moving file." : "Errorea fitxategia mugitzean.",
"Error moving file" : "Errorea fitxategia mugitzean",
"Error" : "Errorea",
"Could not rename file" : "Ezin izan da fitxategia berrizendatu",
"Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
+ "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
"Name" : "Izena",
"Size" : "Tamaina",
"Modified" : "Aldatuta",
@@ -75,6 +77,7 @@ OC.L10N.register(
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
"_matches '{filter}'_::_match '{filter}'_" : ["",""],
"{dirs} and {files}" : "{dirs} eta {files}",
+ "Favorited" : "Gogokoa",
"Favorite" : "Gogokoa",
"%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta",
"%s could not be renamed" : "%s ezin da berrizendatu",
@@ -94,9 +97,15 @@ OC.L10N.register(
"From link" : "Estekatik",
"Upload" : "Igo",
"Cancel upload" : "Ezeztatu igoera",
+ "No files yet" : "Oraingoz fitxategirik ez",
+ "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Upload too large" : "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
- "Currently scanning" : "Eskaneatzen une honetan"
+ "Currently scanning" : "Eskaneatzen une honetan",
+ "No favorites" : "Gogokorik ez",
+ "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index 79b98f6feb8..1529fd880f9 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -53,11 +53,13 @@
"Download" : "Deskargatu",
"Select" : "hautatu",
"Pending" : "Zain",
+ "Unable to determine date" : "Ezin izan da data zehaztu",
"Error moving file." : "Errorea fitxategia mugitzean.",
"Error moving file" : "Errorea fitxategia mugitzean",
"Error" : "Errorea",
"Could not rename file" : "Ezin izan da fitxategia berrizendatu",
"Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
+ "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
"Name" : "Izena",
"Size" : "Tamaina",
"Modified" : "Aldatuta",
@@ -73,6 +75,7 @@
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
"_matches '{filter}'_::_match '{filter}'_" : ["",""],
"{dirs} and {files}" : "{dirs} eta {files}",
+ "Favorited" : "Gogokoa",
"Favorite" : "Gogokoa",
"%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta",
"%s could not be renamed" : "%s ezin da berrizendatu",
@@ -92,9 +95,15 @@
"From link" : "Estekatik",
"Upload" : "Igo",
"Cancel upload" : "Ezeztatu igoera",
+ "No files yet" : "Oraingoz fitxategirik ez",
+ "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Upload too large" : "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
- "Currently scanning" : "Eskaneatzen une honetan"
+ "Currently scanning" : "Eskaneatzen une honetan",
+ "No favorites" : "Gogokorik ez",
+ "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index 85353dc496c..2f3544f489d 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -13,11 +13,11 @@ OC.L10N.register(
"The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.",
"The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
"Not a valid source" : "Sumber tidak sah",
- "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+ "Server is not allowed to open URLs, please check the server configuration" : "Server tidak mengizinkan untuk membuka URL, mohon periksa konfigurasi server",
"The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s",
"Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s",
"Error when creating the file" : "Kesalahan saat membuat berkas",
- "Folder name cannot be empty." : "Nama folder tidak bolh kosong.",
+ "Folder name cannot be empty." : "Nama folder tidak boleh kosong.",
"Error when creating the folder" : "Kesalahan saat membuat folder",
"Unable to set upload directory." : "Tidak dapat mengatur folder unggah",
"Invalid Token" : "Token tidak sah",
@@ -53,12 +53,15 @@ OC.L10N.register(
"Disconnect storage" : "Memutuskan penyimpaan",
"Unshare" : "Batalkan berbagi",
"Download" : "Unduh",
+ "Select" : "Pilih",
"Pending" : "Menunggu",
+ "Unable to determine date" : "Tidak dapat menentukan tanggal",
"Error moving file." : "Kesalahan saat memindahkan berkas.",
"Error moving file" : "Kesalahan saat memindahkan berkas",
"Error" : "Kesalahan ",
"Could not rename file" : "Tidak dapat mengubah nama berkas",
"Error deleting file." : "Kesalahan saat menghapus berkas.",
+ "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
"Name" : "Nama",
"Size" : "Ukuran",
"Modified" : "Dimodifikasi",
@@ -72,8 +75,9 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
- "_matches '{filter}'_::_match '{filter}'_" : [""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
"{dirs} and {files}" : "{dirs} dan {files}",
+ "Favorited" : "Difavoritkan",
"Favorite" : "Favorit",
"%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus",
"%s could not be renamed" : "%s tidak dapat diubah nama",
@@ -93,9 +97,15 @@ OC.L10N.register(
"From link" : "Dari tautan",
"Upload" : "Unggah",
"Cancel upload" : "Batal unggah",
+ "No files yet" : "Masih tidak ada berkas",
+ "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Upload too large" : "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
- "Currently scanning" : "Pemindaian terbaru"
+ "Currently scanning" : "Pemindaian terbaru",
+ "No favorites" : "Tidak ada favorit",
+ "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini."
},
"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index e6c66b0b124..053a1cb3570 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -11,11 +11,11 @@
"The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.",
"The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
"Not a valid source" : "Sumber tidak sah",
- "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+ "Server is not allowed to open URLs, please check the server configuration" : "Server tidak mengizinkan untuk membuka URL, mohon periksa konfigurasi server",
"The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s",
"Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s",
"Error when creating the file" : "Kesalahan saat membuat berkas",
- "Folder name cannot be empty." : "Nama folder tidak bolh kosong.",
+ "Folder name cannot be empty." : "Nama folder tidak boleh kosong.",
"Error when creating the folder" : "Kesalahan saat membuat folder",
"Unable to set upload directory." : "Tidak dapat mengatur folder unggah",
"Invalid Token" : "Token tidak sah",
@@ -51,12 +51,15 @@
"Disconnect storage" : "Memutuskan penyimpaan",
"Unshare" : "Batalkan berbagi",
"Download" : "Unduh",
+ "Select" : "Pilih",
"Pending" : "Menunggu",
+ "Unable to determine date" : "Tidak dapat menentukan tanggal",
"Error moving file." : "Kesalahan saat memindahkan berkas.",
"Error moving file" : "Kesalahan saat memindahkan berkas",
"Error" : "Kesalahan ",
"Could not rename file" : "Tidak dapat mengubah nama berkas",
"Error deleting file." : "Kesalahan saat menghapus berkas.",
+ "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
"Name" : "Nama",
"Size" : "Ukuran",
"Modified" : "Dimodifikasi",
@@ -70,8 +73,9 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
- "_matches '{filter}'_::_match '{filter}'_" : [""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
"{dirs} and {files}" : "{dirs} dan {files}",
+ "Favorited" : "Difavoritkan",
"Favorite" : "Favorit",
"%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus",
"%s could not be renamed" : "%s tidak dapat diubah nama",
@@ -91,9 +95,15 @@
"From link" : "Dari tautan",
"Upload" : "Unggah",
"Cancel upload" : "Batal unggah",
+ "No files yet" : "Masih tidak ada berkas",
+ "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Upload too large" : "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
- "Currently scanning" : "Pemindaian terbaru"
+ "Currently scanning" : "Pemindaian terbaru",
+ "No favorites" : "Tidak ada favorit",
+ "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini."
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 73acf36ae75..0cb3193c61d 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -36,7 +36,7 @@ OC.L10N.register(
"Files" : "ファイル",
"All files" : "すべてのファイル",
"Favorites" : "お気に入り",
- "Home" : "住居",
+ "Home" : "ホーム",
"Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {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} しか残っていません。",
@@ -61,6 +61,7 @@ OC.L10N.register(
"Error" : "エラー",
"Could not rename file" : "ファイルの名前変更ができませんでした",
"Error deleting file." : "ファイルの削除エラー。",
+ "No entries in this folder match '{filter}'" : "このフォルダで '{filter}' にマッチするものはありません",
"Name" : "名前",
"Size" : "サイズ",
"Modified" : "更新日時",
@@ -74,11 +75,11 @@ OC.L10N.register(
"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." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
- "_matches '{filter}'_::_match '{filter}'_" : [""],
+ "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"],
"{dirs} and {files}" : "{dirs} と {files}",
"Favorited" : "お気に入り済",
"Favorite" : "お気に入り",
- "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません",
+ "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません",
"%s could not be renamed" : "%sの名前を変更できませんでした",
"Upload (max. %s)" : "アップロード ( 最大 %s )",
"File handling" : "ファイル操作",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 586d5244c19..570b63ab5f7 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -34,7 +34,7 @@
"Files" : "ファイル",
"All files" : "すべてのファイル",
"Favorites" : "お気に入り",
- "Home" : "住居",
+ "Home" : "ホーム",
"Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {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} しか残っていません。",
@@ -59,6 +59,7 @@
"Error" : "エラー",
"Could not rename file" : "ファイルの名前変更ができませんでした",
"Error deleting file." : "ファイルの削除エラー。",
+ "No entries in this folder match '{filter}'" : "このフォルダで '{filter}' にマッチするものはありません",
"Name" : "名前",
"Size" : "サイズ",
"Modified" : "更新日時",
@@ -72,11 +73,11 @@
"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." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
- "_matches '{filter}'_::_match '{filter}'_" : [""],
+ "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"],
"{dirs} and {files}" : "{dirs} と {files}",
"Favorited" : "お気に入り済",
"Favorite" : "お気に入り",
- "%s could not be renamed as it has been deleted" : "%s は削除された為、ファイル名を変更できません",
+ "%s could not be renamed as it has been deleted" : "%s は削除されたため、ファイル名を変更できません",
"%s could not be renamed" : "%sの名前を変更できませんでした",
"Upload (max. %s)" : "アップロード ( 最大 %s )",
"File handling" : "ファイル操作",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index a528ba4542b..34ff0f0c2d7 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -75,7 +75,7 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
"{dirs} and {files}" : "{dirs} og {files}",
"Favorited" : "Er favoritt",
"Favorite" : "Gjør til favoritt",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index c3957977e3b..2af4e446204 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -73,7 +73,7 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
"{dirs} and {files}" : "{dirs} og {files}",
"Favorited" : "Er favoritt",
"Favorite" : "Gjør til favoritt",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index fd920a75ffa..57c37495e4e 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -61,6 +61,7 @@ OC.L10N.register(
"Error" : "Erro",
"Could not rename file" : "Não pôde renomear o ficheiro",
"Error deleting file." : "Erro ao apagar o ficheiro.",
+ "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
"Name" : "Nome",
"Size" : "Tamanho",
"Modified" : "Modificado",
@@ -74,8 +75,9 @@ OC.L10N.register(
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
"{dirs} and {files}" : "{dirs} e {files}",
+ "Favorited" : "Assinalado como Favorito",
"Favorite" : "Favorito",
"%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado",
"%s could not be renamed" : "%s não pode ser renomeada",
@@ -95,12 +97,15 @@ OC.L10N.register(
"From link" : "Da hiperligação",
"Upload" : "Enviar",
"Cancel upload" : "Cancelar o envio",
+ "No files yet" : "Ainda não há arquivos",
+ "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Upload too large" : "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
"Currently scanning" : "A analisar",
- "No favorites" : "Sem favoritos"
+ "No favorites" : "Sem favoritos",
+ "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index 742d5349bdb..bd168dfb4b1 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -59,6 +59,7 @@
"Error" : "Erro",
"Could not rename file" : "Não pôde renomear o ficheiro",
"Error deleting file." : "Erro ao apagar o ficheiro.",
+ "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
"Name" : "Nome",
"Size" : "Tamanho",
"Modified" : "Modificado",
@@ -72,8 +73,9 @@
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
- "_matches '{filter}'_::_match '{filter}'_" : ["",""],
+ "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
"{dirs} and {files}" : "{dirs} e {files}",
+ "Favorited" : "Assinalado como Favorito",
"Favorite" : "Favorito",
"%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado",
"%s could not be renamed" : "%s não pode ser renomeada",
@@ -93,12 +95,15 @@
"From link" : "Da hiperligação",
"Upload" : "Enviar",
"Cancel upload" : "Cancelar o envio",
+ "No files yet" : "Ainda não há arquivos",
+ "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Upload too large" : "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
"Currently scanning" : "A analisar",
- "No favorites" : "Sem favoritos"
+ "No favorites" : "Sem favoritos",
+ "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index f5b0413dcd4..853cb02112d 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -22,11 +22,11 @@ OC.L10N.register(
"Unable to set upload directory." : "Невозможно установить каталог загрузки.",
"Invalid Token" : "Недопустимый маркер",
"No file was uploaded. Unknown error" : "Файл не был загружен. Неизвестная ошибка",
- "There is no error, the file uploaded with success" : "Файл загружен успешно.",
- "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме",
+ "There is no error, the file uploaded with success" : "Файл загружен успешно. Ошибок нет.",
+ "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Размер загруженного файла превышает установленный предел upload_max_filesize в php.ini:",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Размер загруженного файла превышает установленный предел MAX_FILE_SIZE в HTML-форме",
"The uploaded file was only partially uploaded" : "Файл загружен лишь частично",
- "No file was uploaded" : "Ни одного файла загружено не было",
+ "No file was uploaded" : "Не было загружено ни одного файла",
"Missing a temporary folder" : "Отсутствует временный каталог",
"Failed to write to disk" : "Ошибка записи на диск",
"Not enough storage available" : "Недостаточно доступного места в хранилище",
@@ -36,10 +36,10 @@ OC.L10N.register(
"Files" : "Файлы",
"All files" : "Все файлы",
"Favorites" : "Избранное",
- "Home" : "Домашний",
+ "Home" : "Главная",
"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}",
+ "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." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
@@ -50,18 +50,18 @@ OC.L10N.register(
"Error fetching URL" : "Ошибка получения URL",
"Rename" : "Переименовать",
"Delete" : "Удалить",
- "Disconnect storage" : "Отсоединиться от хранилища",
+ "Disconnect storage" : "Отсоединить хранилище",
"Unshare" : "Закрыть доступ",
"Download" : "Скачать",
"Select" : "Выбрать",
"Pending" : "Ожидание",
"Unable to determine date" : "Невозможно определить дату",
- "Error moving file." : "Ошибка перемещения файла.",
+ "Error moving file." : "Ошибка при перемещении файла.",
"Error moving file" : "Ошибка при перемещении файла",
"Error" : "Ошибка",
"Could not rename file" : "Не удалось переименовать файл",
"Error deleting file." : "Ошибка при удалении файла.",
- "No entries in this folder match '{filter}'" : "В данном каталоге нет ничего соответствующего '{filter}'",
+ "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'",
"Name" : "Имя",
"Size" : "Размер",
"Modified" : "Изменён",
@@ -69,10 +69,10 @@ OC.L10N.register(
"_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов"],
"You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
"_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов"],
- "\"{name}\" is an invalid file name." : "\"{name}\" это не правильное имя файла.",
+ "\"{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" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь",
+ "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." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
"_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"],
@@ -81,7 +81,7 @@ OC.L10N.register(
"Favorite" : "Избранное",
"%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.",
"%s could not be renamed" : "%s не может быть переименован",
- "Upload (max. %s)" : "Загрузка (Максимум: %s)",
+ "Upload (max. %s)" : "Загрузка (максимум %s)",
"File handling" : "Управление файлами",
"Maximum upload size" : "Максимальный размер загружаемого файла",
"max. possible: " : "макс. возможно: ",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 2c238e7ad0f..4852a8aebcd 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -20,11 +20,11 @@
"Unable to set upload directory." : "Невозможно установить каталог загрузки.",
"Invalid Token" : "Недопустимый маркер",
"No file was uploaded. Unknown error" : "Файл не был загружен. Неизвестная ошибка",
- "There is no error, the file uploaded with success" : "Файл загружен успешно.",
- "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме",
+ "There is no error, the file uploaded with success" : "Файл загружен успешно. Ошибок нет.",
+ "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Размер загруженного файла превышает установленный предел upload_max_filesize в php.ini:",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Размер загруженного файла превышает установленный предел MAX_FILE_SIZE в HTML-форме",
"The uploaded file was only partially uploaded" : "Файл загружен лишь частично",
- "No file was uploaded" : "Ни одного файла загружено не было",
+ "No file was uploaded" : "Не было загружено ни одного файла",
"Missing a temporary folder" : "Отсутствует временный каталог",
"Failed to write to disk" : "Ошибка записи на диск",
"Not enough storage available" : "Недостаточно доступного места в хранилище",
@@ -34,10 +34,10 @@
"Files" : "Файлы",
"All files" : "Все файлы",
"Favorites" : "Избранное",
- "Home" : "Домашний",
+ "Home" : "Главная",
"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}",
+ "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." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
@@ -48,18 +48,18 @@
"Error fetching URL" : "Ошибка получения URL",
"Rename" : "Переименовать",
"Delete" : "Удалить",
- "Disconnect storage" : "Отсоединиться от хранилища",
+ "Disconnect storage" : "Отсоединить хранилище",
"Unshare" : "Закрыть доступ",
"Download" : "Скачать",
"Select" : "Выбрать",
"Pending" : "Ожидание",
"Unable to determine date" : "Невозможно определить дату",
- "Error moving file." : "Ошибка перемещения файла.",
+ "Error moving file." : "Ошибка при перемещении файла.",
"Error moving file" : "Ошибка при перемещении файла",
"Error" : "Ошибка",
"Could not rename file" : "Не удалось переименовать файл",
"Error deleting file." : "Ошибка при удалении файла.",
- "No entries in this folder match '{filter}'" : "В данном каталоге нет ничего соответствующего '{filter}'",
+ "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'",
"Name" : "Имя",
"Size" : "Размер",
"Modified" : "Изменён",
@@ -67,10 +67,10 @@
"_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов"],
"You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
"_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов"],
- "\"{name}\" is an invalid file name." : "\"{name}\" это не правильное имя файла.",
+ "\"{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" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь",
+ "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." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
"_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"],
@@ -79,7 +79,7 @@
"Favorite" : "Избранное",
"%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.",
"%s could not be renamed" : "%s не может быть переименован",
- "Upload (max. %s)" : "Загрузка (Максимум: %s)",
+ "Upload (max. %s)" : "Загрузка (максимум %s)",
"File handling" : "Управление файлами",
"Maximum upload size" : "Максимальный размер загружаемого файла",
"max. possible: " : "макс. возможно: ",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index 9e35b1f47ce..6a497a4b3c1 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -98,7 +98,7 @@ OC.L10N.register(
"Upload" : "Yükle",
"Cancel upload" : "Yüklemeyi iptal et",
"No files yet" : "Henüz dosya yok",
- "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşleştirin!",
+ "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
"No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı",
"Select all" : "Tümünü seç",
"Upload too large" : "Yükleme çok büyük",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index feb049474ba..7f23744c96a 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -96,7 +96,7 @@
"Upload" : "Yükle",
"Cancel upload" : "Yüklemeyi iptal et",
"No files yet" : "Henüz dosya yok",
- "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşleştirin!",
+ "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
"No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı",
"Select all" : "Tümünü seç",
"Upload too large" : "Yükleme çok büyük",
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 84b1a0f1662..bcca6f0a276 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -13,21 +13,26 @@ use OCP\Files\FileInfo;
/**
* Helper class for manipulating file information
*/
-class Helper
-{
+class Helper {
+ /**
+ * @param string $dir
+ * @return array
+ * @throws \OCP\Files\NotFoundException
+ */
public static function buildFileStorageStatistics($dir) {
// information about storage capacities
$storageInfo = \OC_Helper::getStorageInfo($dir);
-
$l = new \OC_L10N('files');
$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
- return array('uploadMaxFilesize' => $maxUploadFileSize,
- 'maxHumanFilesize' => $maxHumanFileSize,
- 'freeSpace' => $storageInfo['free'],
- 'usedSpacePercent' => (int)$storageInfo['relative']);
+ return [
+ 'uploadMaxFilesize' => $maxUploadFileSize,
+ 'maxHumanFilesize' => $maxHumanFileSize,
+ 'freeSpace' => $storageInfo['free'],
+ 'usedSpacePercent' => (int)$storageInfo['relative']
+ ];
}
/**
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 6fcef693bed..7f7e09d6271 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -19,4 +19,7 @@
<filesystem/>
</types>
<ocsid>166047</ocsid>
+ <dependencies>
+ <lib>openssl</lib>
+ </dependencies>
</info>
diff --git a/apps/files_encryption/appinfo/register_command.php b/apps/files_encryption/appinfo/register_command.php
new file mode 100644
index 00000000000..dfb7f5c375a
--- /dev/null
+++ b/apps/files_encryption/appinfo/register_command.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+use OCA\Files_Encryption\Command\MigrateKeys;
+
+$userManager = OC::$server->getUserManager();
+$application->add(new MigrateKeys($userManager));
diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index faef31a4357..39e898a4f95 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.7.0
+0.7.1
diff --git a/apps/files_encryption/command/migratekeys.php b/apps/files_encryption/command/migratekeys.php
new file mode 100644
index 00000000000..d6db1f70892
--- /dev/null
+++ b/apps/files_encryption/command/migratekeys.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright (c) 2015 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Encryption\Command;
+
+use OCA\Files_Encryption\Migration;
+use OCP\IUserBackend;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MigrateKeys extends Command {
+
+ /** @var \OC\User\Manager */
+ private $userManager;
+
+ public function __construct(\OC\User\Manager $userManager) {
+ $this->userManager = $userManager;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('encryption:migrate-keys')
+ ->setDescription('migrate encryption keys')
+ ->addArgument(
+ 'user_id',
+ InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+ 'will migrate keys of the given user(s)'
+ );
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+
+ // perform system reorganization
+ $migration = new Migration();
+ $output->writeln("Reorganize system folder structure");
+ $migration->reorganizeSystemFolderStructure();
+
+ $users = $input->getArgument('user_id');
+ if (!empty($users)) {
+ foreach ($users as $user) {
+ if ($this->userManager->userExists($user)) {
+ $output->writeln("Migrating keys <info>$user</info>");
+ $migration->reorganizeFolderStructureForUser($user);
+ } else {
+ $output->writeln("<error>Unknown user $user</error>");
+ }
+ }
+ } else {
+ foreach($this->userManager->getBackends() as $backend) {
+ $name = get_class($backend);
+
+ if ($backend instanceof IUserBackend) {
+ $name = $backend->getBackendName();
+ }
+
+ $output->writeln("Migrating keys for users on backend <info>$name</info>");
+
+ $limit = 500;
+ $offset = 0;
+ do {
+ $users = $backend->getUsers('', $limit, $offset);
+ foreach ($users as $user) {
+ $output->writeln(" <info>$user</info>");
+ $migration->reorganizeFolderStructureForUser($user);
+ }
+ $offset += $limit;
+ } while(count($users) >= $limit);
+ }
+ }
+
+ }
+}
diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js
index f0661f3b316..6f5876c0654 100644
--- a/apps/files_encryption/l10n/bg_BG.js
+++ b/apps/files_encryption/l10n/bg_BG.js
@@ -26,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
"Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
"Missing requirements." : "Липсва задължителна информация.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.",
"Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
"Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
+ "Server-side Encryption" : "Криптиране от страна на сървъра",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
"Recovery key password" : "Парола за възстановяане на ключа",
diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json
index 3108ec85b50..055c434d229 100644
--- a/apps/files_encryption/l10n/bg_BG.json
+++ b/apps/files_encryption/l10n/bg_BG.json
@@ -24,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
"Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
"Missing requirements." : "Липсва задължителна информация.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.",
"Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
"Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
+ "Server-side Encryption" : "Криптиране от страна на сървъра",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
"Recovery key password" : "Парола за възстановяане на ключа",
diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js
index daef2cab1ae..667b8e72c7a 100644
--- a/apps/files_encryption/l10n/da.js
+++ b/apps/files_encryption/l10n/da.js
@@ -21,7 +21,7 @@ OC.L10N.register(
"Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
"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." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"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." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
"Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
"Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
@@ -29,7 +29,8 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at OpenSSL, sammen med PHP-udvidelsen, er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
"Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+ "Server-side Encryption" : "Kryptering på serverdelen",
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
@@ -38,7 +39,7 @@ OC.L10N.register(
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
"Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
"New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
- "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode",
+ "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
"Change Password" : "Skift Kodeord",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json
index b813b9b575e..0561094f291 100644
--- a/apps/files_encryption/l10n/da.json
+++ b/apps/files_encryption/l10n/da.json
@@ -19,7 +19,7 @@
"Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
"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." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"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." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
"Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
"Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
@@ -27,7 +27,8 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at OpenSSL, sammen med PHP-udvidelsen, er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
"Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+ "Server-side Encryption" : "Kryptering på serverdelen",
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
@@ -36,7 +37,7 @@
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
"Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
"New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
- "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode",
+ "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
"Change Password" : "Skift Kodeord",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js
index 6b4b80dd0c3..9ad50104ea8 100644
--- a/apps/files_encryption/l10n/de_DE.js
+++ b/apps/files_encryption/l10n/de_DE.js
@@ -27,11 +27,11 @@ OC.L10N.register(
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
"Missing requirements." : "Fehlende Voraussetzungen",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
- "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+ "Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
- "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+ "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
"Recovery key password" : "Wiederherstellungschlüsselpasswort",
"Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json
index 4c2dbcb283d..135818e290c 100644
--- a/apps/files_encryption/l10n/de_DE.json
+++ b/apps/files_encryption/l10n/de_DE.json
@@ -25,11 +25,11 @@
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
"Missing requirements." : "Fehlende Voraussetzungen",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
- "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+ "Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
- "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+ "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
"Recovery key password" : "Wiederherstellungschlüsselpasswort",
"Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
diff --git a/apps/files_encryption/l10n/en_GB.js b/apps/files_encryption/l10n/en_GB.js
index ede6a648dc4..dc0dba85eb2 100644
--- a/apps/files_encryption/l10n/en_GB.js
+++ b/apps/files_encryption/l10n/en_GB.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that OpenSSL together with the PHP extension is enabled and properly configured. For now, the encryption app has been disabled.",
"Following users are not set up for encryption:" : "Following users are not set up for encryption:",
"Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.",
+ "Server-side Encryption" : "Server-side Encryption",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
"Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
"Recovery key password" : "Recovery key password",
diff --git a/apps/files_encryption/l10n/en_GB.json b/apps/files_encryption/l10n/en_GB.json
index 024632b3cfb..8afafc4e908 100644
--- a/apps/files_encryption/l10n/en_GB.json
+++ b/apps/files_encryption/l10n/en_GB.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that OpenSSL together with the PHP extension is enabled and properly configured. For now, the encryption app has been disabled.",
"Following users are not set up for encryption:" : "Following users are not set up for encryption:",
"Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.",
+ "Server-side Encryption" : "Server-side Encryption",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
"Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
"Recovery key password" : "Recovery key password",
diff --git a/apps/files_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js
index 42f6b9cdd57..d1d1b55f73b 100644
--- a/apps/files_encryption/l10n/eu.js
+++ b/apps/files_encryption/l10n/eu.js
@@ -13,6 +13,9 @@ OC.L10N.register(
"Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
"Password successfully changed." : "Pasahitza behar bezala aldatu da.",
"Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+ "Could not update the private key password." : "Ezin izan da gako pribatu pasahitza eguneratu. ",
+ "The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.",
+ "The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.",
"Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
"File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
@@ -23,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
"Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.",
"Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
+ "Server-side Encryption" : "Zerbitzari aldeko enkriptazioa",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Recovery key password" : "Berreskuratze gako pasahitza",
diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json
index 334bb077806..3bd66a039f3 100644
--- a/apps/files_encryption/l10n/eu.json
+++ b/apps/files_encryption/l10n/eu.json
@@ -11,6 +11,9 @@
"Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
"Password successfully changed." : "Pasahitza behar bezala aldatu da.",
"Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+ "Could not update the private key password." : "Ezin izan da gako pribatu pasahitza eguneratu. ",
+ "The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.",
+ "The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.",
"Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
"File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
@@ -21,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
"Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.",
"Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
+ "Server-side Encryption" : "Zerbitzari aldeko enkriptazioa",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Recovery key password" : "Berreskuratze gako pasahitza",
diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
index bae11bf897e..64a600500eb 100644
--- a/apps/files_encryption/l10n/fr.js
+++ b/apps/files_encryption/l10n/fr.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.",
"Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.",
+ "Server-side Encryption" : "Chiffrement côté serveur",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"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/fr.json b/apps/files_encryption/l10n/fr.json
index 5dc221691f0..1c64ab1f3c0 100644
--- a/apps/files_encryption/l10n/fr.json
+++ b/apps/files_encryption/l10n/fr.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.",
"Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.",
+ "Server-side Encryption" : "Chiffrement côté serveur",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"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/ja.js b/apps/files_encryption/l10n/ja.js
index a033e80b914..8fb1364e042 100644
--- a/apps/files_encryption/l10n/ja.js
+++ b/apps/files_encryption/l10n/ja.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "必ず、OpenSSL及びOpenSSLのPHPの拡張を有効にした上で、適切に設定してください。現時点では暗号化アプリは無効になっています。",
"Following users are not set up for encryption:" : "以下のユーザーは、暗号化設定がされていません:",
"Go directly to your %spersonal settings%s." : "直接 %s個人設定%s に進む。",
+ "Server-side Encryption" : "サーバー側暗号",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
"Recovery key password" : "リカバリキーのパスワード",
diff --git a/apps/files_encryption/l10n/ja.json b/apps/files_encryption/l10n/ja.json
index 25b64525102..d88a65fe492 100644
--- a/apps/files_encryption/l10n/ja.json
+++ b/apps/files_encryption/l10n/ja.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "必ず、OpenSSL及びOpenSSLのPHPの拡張を有効にした上で、適切に設定してください。現時点では暗号化アプリは無効になっています。",
"Following users are not set up for encryption:" : "以下のユーザーは、暗号化設定がされていません:",
"Go directly to your %spersonal settings%s." : "直接 %s個人設定%s に進む。",
+ "Server-side Encryption" : "サーバー側暗号",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
"Recovery key password" : "リカバリキーのパスワード",
diff --git a/apps/files_encryption/l10n/ko.js b/apps/files_encryption/l10n/ko.js
index fd9a9e198b2..3d09c0abff2 100644
--- a/apps/files_encryption/l10n/ko.js
+++ b/apps/files_encryption/l10n/ko.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL 및 PHP OpenSSL 확장이 활성화되어 있고 올바르게 설정되어 있는지 확인하십시오. 현재 암호화 앱이 비활성화되었습니다.",
"Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:",
"Go directly to your %spersonal settings%s." : "%s개인 설정%s으로 직접 이동하십시오.",
+ "Server-side Encryption" : "서버 측 암호화",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
"Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
"Recovery key password" : "복구 키 암호",
diff --git a/apps/files_encryption/l10n/ko.json b/apps/files_encryption/l10n/ko.json
index c334585b62b..6e6c6f162c0 100644
--- a/apps/files_encryption/l10n/ko.json
+++ b/apps/files_encryption/l10n/ko.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL 및 PHP OpenSSL 확장이 활성화되어 있고 올바르게 설정되어 있는지 확인하십시오. 현재 암호화 앱이 비활성화되었습니다.",
"Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:",
"Go directly to your %spersonal settings%s." : "%s개인 설정%s으로 직접 이동하십시오.",
+ "Server-side Encryption" : "서버 측 암호화",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
"Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
"Recovery key password" : "복구 키 암호",
diff --git a/apps/files_encryption/l10n/nb_NO.js b/apps/files_encryption/l10n/nb_NO.js
index a4fde8b8614..ff52350f98a 100644
--- a/apps/files_encryption/l10n/nb_NO.js
+++ b/apps/files_encryption/l10n/nb_NO.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.",
"Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
+ "Server-side Encryption" : "Serverkryptering",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
diff --git a/apps/files_encryption/l10n/nb_NO.json b/apps/files_encryption/l10n/nb_NO.json
index 8bd4598d007..3aa4ec9e868 100644
--- a/apps/files_encryption/l10n/nb_NO.json
+++ b/apps/files_encryption/l10n/nb_NO.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.",
"Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
+ "Server-side Encryption" : "Serverkryptering",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
diff --git a/apps/files_encryption/l10n/nl.js b/apps/files_encryption/l10n/nl.js
index a42060392c5..1100abd76fd 100644
--- a/apps/files_encryption/l10n/nl.js
+++ b/apps/files_encryption/l10n/nl.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Weed er zeker van dat OpenSSL met de PHP extensie is ingeschakeld en goed geconfigureerd. Op dit moment is de encryptie app uitgeschakeld.",
"Following users are not set up for encryption:" : "De volgende gebruikers hebben geen configuratie voor encryptie:",
"Go directly to your %spersonal settings%s." : "Ga direct naar uw %spersoonlijke instellingen%s.",
+ "Server-side Encryption" : "Server-side versleuteling",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
"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/nl.json b/apps/files_encryption/l10n/nl.json
index 0a25e209e2e..dab88f4a2e2 100644
--- a/apps/files_encryption/l10n/nl.json
+++ b/apps/files_encryption/l10n/nl.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Weed er zeker van dat OpenSSL met de PHP extensie is ingeschakeld en goed geconfigureerd. Op dit moment is de encryptie app uitgeschakeld.",
"Following users are not set up for encryption:" : "De volgende gebruikers hebben geen configuratie voor encryptie:",
"Go directly to your %spersonal settings%s." : "Ga direct naar uw %spersoonlijke instellingen%s.",
+ "Server-side Encryption" : "Server-side versleuteling",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
"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.js b/apps/files_encryption/l10n/pl.js
index 7751cb1182d..c53d1e12cc6 100644
--- a/apps/files_encryption/l10n/pl.js
+++ b/apps/files_encryption/l10n/pl.js
@@ -26,8 +26,10 @@ OC.L10N.register(
"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.",
"Missing requirements." : "Brak wymagań.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Upewnij się, że OpenSSL jest włączony razem z rozszerzeniem PHP i poprawnie skonfigurowany, Obecnie aplikacja szyfrowania została wyłączona.",
"Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
"Go directly to your %spersonal settings%s." : "Przejdź bezpośrednio do %spersonal settings%s.",
+ "Server-side Encryption" : "Szyfrowanie po stronie serwera",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
"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/pl.json b/apps/files_encryption/l10n/pl.json
index f9403e9029f..d9d22b2c327 100644
--- a/apps/files_encryption/l10n/pl.json
+++ b/apps/files_encryption/l10n/pl.json
@@ -24,8 +24,10 @@
"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.",
"Missing requirements." : "Brak wymagań.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Upewnij się, że OpenSSL jest włączony razem z rozszerzeniem PHP i poprawnie skonfigurowany, Obecnie aplikacja szyfrowania została wyłączona.",
"Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
"Go directly to your %spersonal settings%s." : "Przejdź bezpośrednio do %spersonal settings%s.",
+ "Server-side Encryption" : "Szyfrowanie po stronie serwera",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
"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.js b/apps/files_encryption/l10n/pt_PT.js
index 574a53e8f75..3d6e8a50749 100644
--- a/apps/files_encryption/l10n/pt_PT.js
+++ b/apps/files_encryption/l10n/pt_PT.js
@@ -26,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
"Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
"Missing requirements." : "Requisitos em falta.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL, em conjunto com a extensão PHP, está ativado e configurado corretamente. Por agora, a aplicação de encriptação está desactivada.",
"Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:",
"Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.",
+ "Server-side Encryption" : "Encriptação do lado do Servidor",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
"Recovery key password" : "Senha da chave de recuperação",
diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json
index 98314896c5b..d2a34ec9d01 100644
--- a/apps/files_encryption/l10n/pt_PT.json
+++ b/apps/files_encryption/l10n/pt_PT.json
@@ -24,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
"Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
"Missing requirements." : "Requisitos em falta.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se de que o OpenSSL, em conjunto com a extensão PHP, está ativado e configurado corretamente. Por agora, a aplicação de encriptação está desactivada.",
"Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:",
"Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.",
+ "Server-side Encryption" : "Encriptação do lado do Servidor",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
"Recovery key password" : "Senha da chave de recuperação",
diff --git a/apps/files_encryption/l10n/ru.js b/apps/files_encryption/l10n/ru.js
index da278e5abc7..bda0d26d80b 100644
--- a/apps/files_encryption/l10n/ru.js
+++ b/apps/files_encryption/l10n/ru.js
@@ -19,7 +19,7 @@ OC.L10N.register(
"Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.",
"File recovery settings updated" : "Настройки восстановления файлов обновлены",
"Could not update file recovery" : "Невозможно обновить настройки восстановления файлов",
- "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." : "Приложение шифрования не инициализированно! Возможно приложение шифрования было реактивировано во время вашей сессии. Попробуйте выйти и войти снова чтобы проинициализировать приложение шифрования.",
+ "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." : "Приложение шифрования не инициализировано! Возможно приложение шифрования было выключено и включено снова во время вашей сессии. Попробуйте выйти и войти снова чтобы инициализировать приложение шифрования.",
"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." : "Закрытый ключ недействителен! Вероятно, пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить закрытый ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
"Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Проверьте системные настройки или свяжитесь с вашим администратором",
@@ -28,14 +28,15 @@ OC.L10N.register(
"Missing requirements." : "Отсутствуют зависимости.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Убедитесь, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования выключено.",
"Following users are not set up for encryption:" : "Для следующих пользователей шифрование не настроено:",
- "Go directly to your %spersonal settings%s." : "Перейти к вашим %spersonal settings%s.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь",
+ "Go directly to your %spersonal settings%s." : "Перейти к вашим %sличным настройкам%s.",
+ "Server-side Encryption" : "Шифрование на стороне сервера",
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
"Recovery key password" : "Пароль ключа восстановления",
"Repeat Recovery key password" : "Повторите пароль ключа восстановления",
"Enabled" : "Включено",
"Disabled" : "Отключено",
- "Change recovery key password:" : "Сменить пароль ключа восстановления:",
+ "Change recovery key password:" : "Смена пароля ключа восстановления:",
"Old Recovery key password" : "Старый пароль ключа восстановления",
"New Recovery key password" : "Новый пароль ключа восстановления",
"Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления",
diff --git a/apps/files_encryption/l10n/ru.json b/apps/files_encryption/l10n/ru.json
index fa4eae76523..3fe5bea497a 100644
--- a/apps/files_encryption/l10n/ru.json
+++ b/apps/files_encryption/l10n/ru.json
@@ -17,7 +17,7 @@
"Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.",
"File recovery settings updated" : "Настройки восстановления файлов обновлены",
"Could not update file recovery" : "Невозможно обновить настройки восстановления файлов",
- "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." : "Приложение шифрования не инициализированно! Возможно приложение шифрования было реактивировано во время вашей сессии. Попробуйте выйти и войти снова чтобы проинициализировать приложение шифрования.",
+ "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." : "Приложение шифрования не инициализировано! Возможно приложение шифрования было выключено и включено снова во время вашей сессии. Попробуйте выйти и войти снова чтобы инициализировать приложение шифрования.",
"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." : "Закрытый ключ недействителен! Вероятно, пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить закрытый ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
"Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Проверьте системные настройки или свяжитесь с вашим администратором",
@@ -26,14 +26,15 @@
"Missing requirements." : "Отсутствуют зависимости.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Убедитесь, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования выключено.",
"Following users are not set up for encryption:" : "Для следующих пользователей шифрование не настроено:",
- "Go directly to your %spersonal settings%s." : "Перейти к вашим %spersonal settings%s.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите вновь",
+ "Go directly to your %spersonal settings%s." : "Перейти к вашим %sличным настройкам%s.",
+ "Server-side Encryption" : "Шифрование на стороне сервера",
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
"Recovery key password" : "Пароль ключа восстановления",
"Repeat Recovery key password" : "Повторите пароль ключа восстановления",
"Enabled" : "Включено",
"Disabled" : "Отключено",
- "Change recovery key password:" : "Сменить пароль ключа восстановления:",
+ "Change recovery key password:" : "Смена пароля ключа восстановления:",
"Old Recovery key password" : "Старый пароль ключа восстановления",
"New Recovery key password" : "Новый пароль ключа восстановления",
"Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления",
diff --git a/apps/files_encryption/l10n/sk_SK.js b/apps/files_encryption/l10n/sk_SK.js
index fb57e143293..799a2c1d21f 100644
--- a/apps/files_encryption/l10n/sk_SK.js
+++ b/apps/files_encryption/l10n/sk_SK.js
@@ -2,11 +2,19 @@ OC.L10N.register(
"files_encryption",
{
"Unknown error" : "Neznáma chyba",
+ "Missing recovery key password" : "Chýba kľúč pre obnovu hesla",
+ "Please repeat the recovery key password" : "Prosím zopakujte heslo kľúča pre obnovu",
+ "Repeated recovery key password does not match the provided recovery key password" : "Zopakované heslo kľúča pre obnovenie nesúhlasí zo zadaným heslom",
"Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený",
"Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
"Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný",
+ "Please provide the old recovery password" : "Zadajte prosím staré heslo pre obnovenie",
+ "Please provide a new recovery password" : "Zadajte prosím nové heslo pre obnovenie",
+ "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pre obnovenie",
"Password successfully changed." : "Heslo úspešne zmenené.",
"Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+ "Could not update the private key password." : "Nemožno aktualizovať heslo súkromného kľúča.",
+ "The old password was not correct, please try again." : "Staré heslo nebolo zadané správne, prosím skúste to ešte raz.",
"The current log-in password was not correct, please try again." : "Toto heslo nebolo správne, prosím skúste to ešte raz.",
"Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.",
"File recovery settings updated" : "Nastavenie obnovy súborov aktualizované",
@@ -18,8 +26,10 @@ OC.L10N.register(
"Initial encryption started... This can take some time. Please wait." : "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
"Initial encryption running... Please try again later." : "Počiatočné šifrovanie beží... Skúste to neskôr znovu.",
"Missing requirements." : "Chýbajúce požiadavky.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Uistite sa, že OpenSSL spoločne s rozšírením pre PHP je povolené a správne nakonfigurované. V tejto chvíli je šifrovanie dočasne vypnuté.",
"Following users are not set up for encryption:" : "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
"Go directly to your %spersonal settings%s." : "Prejsť priamo do svojho %sosobného nastavenia%s.",
+ "Server-side Encryption" : "Šifrovanie na serveri",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
"Recovery key password" : "Heslo obnovovacieho kľúča",
diff --git a/apps/files_encryption/l10n/sk_SK.json b/apps/files_encryption/l10n/sk_SK.json
index 8194b240083..08e9d42638f 100644
--- a/apps/files_encryption/l10n/sk_SK.json
+++ b/apps/files_encryption/l10n/sk_SK.json
@@ -1,10 +1,18 @@
{ "translations": {
"Unknown error" : "Neznáma chyba",
+ "Missing recovery key password" : "Chýba kľúč pre obnovu hesla",
+ "Please repeat the recovery key password" : "Prosím zopakujte heslo kľúča pre obnovu",
+ "Repeated recovery key password does not match the provided recovery key password" : "Zopakované heslo kľúča pre obnovenie nesúhlasí zo zadaným heslom",
"Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený",
"Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
"Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný",
+ "Please provide the old recovery password" : "Zadajte prosím staré heslo pre obnovenie",
+ "Please provide a new recovery password" : "Zadajte prosím nové heslo pre obnovenie",
+ "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pre obnovenie",
"Password successfully changed." : "Heslo úspešne zmenené.",
"Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+ "Could not update the private key password." : "Nemožno aktualizovať heslo súkromného kľúča.",
+ "The old password was not correct, please try again." : "Staré heslo nebolo zadané správne, prosím skúste to ešte raz.",
"The current log-in password was not correct, please try again." : "Toto heslo nebolo správne, prosím skúste to ešte raz.",
"Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.",
"File recovery settings updated" : "Nastavenie obnovy súborov aktualizované",
@@ -16,8 +24,10 @@
"Initial encryption started... This can take some time. Please wait." : "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
"Initial encryption running... Please try again later." : "Počiatočné šifrovanie beží... Skúste to neskôr znovu.",
"Missing requirements." : "Chýbajúce požiadavky.",
+ "Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Uistite sa, že OpenSSL spoločne s rozšírením pre PHP je povolené a správne nakonfigurované. V tejto chvíli je šifrovanie dočasne vypnuté.",
"Following users are not set up for encryption:" : "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
"Go directly to your %spersonal settings%s." : "Prejsť priamo do svojho %sosobného nastavenia%s.",
+ "Server-side Encryption" : "Šifrovanie na serveri",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
"Recovery key password" : "Heslo obnovovacieho kľúča",
diff --git a/apps/files_encryption/l10n/tr.js b/apps/files_encryption/l10n/tr.js
index 1be2d5e6035..0ff5a227b54 100644
--- a/apps/files_encryption/l10n/tr.js
+++ b/apps/files_encryption/l10n/tr.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL'nin PHP uzantısıyla birlikte etkin ve düzgün yapılandırılmış olduğundan emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
"Following users are not set up for encryption:" : "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
"Go directly to your %spersonal settings%s." : "Doğrudan %skişisel ayarlarınıza%s gidin.",
+ "Server-side Encryption" : "Sunucu Taraflı Şifreleme",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
"Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
"Recovery key password" : "Kurtarma anahtarı parolası",
diff --git a/apps/files_encryption/l10n/tr.json b/apps/files_encryption/l10n/tr.json
index d325e3f412c..c35db71b49b 100644
--- a/apps/files_encryption/l10n/tr.json
+++ b/apps/files_encryption/l10n/tr.json
@@ -27,6 +27,7 @@
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL'nin PHP uzantısıyla birlikte etkin ve düzgün yapılandırılmış olduğundan emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
"Following users are not set up for encryption:" : "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
"Go directly to your %spersonal settings%s." : "Doğrudan %skişisel ayarlarınıza%s gidin.",
+ "Server-side Encryption" : "Sunucu Taraflı Şifreleme",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
"Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
"Recovery key password" : "Kurtarma anahtarı parolası",
diff --git a/apps/files_encryption/l10n/zh_CN.js b/apps/files_encryption/l10n/zh_CN.js
index 31a6a304be7..f6038cc6fdf 100644
--- a/apps/files_encryption/l10n/zh_CN.js
+++ b/apps/files_encryption/l10n/zh_CN.js
@@ -2,11 +2,18 @@ OC.L10N.register(
"files_encryption",
{
"Unknown error" : "未知错误",
+ "Missing recovery key password" : "丢失的回复密钥",
+ "Please repeat the recovery key password" : "请替换恢复密钥",
"Recovery key successfully enabled" : "恢复密钥成功启用",
"Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码!",
"Recovery key successfully disabled" : "恢复密钥成功禁用",
+ "Please provide the old recovery password" : "请提供原来的恢复密码",
+ "Please provide a new recovery password" : "请提供一个新的恢复密码",
+ "Please repeat the new recovery password" : "请替换新的恢复密码",
"Password successfully changed." : "密码修改成功。",
"Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+ "Could not update the private key password." : "不能更新私有密钥。",
+ "The old password was not correct, please try again." : "原始密码错误,请重试。",
"Private key password successfully updated." : "私钥密码成功更新。",
"File recovery settings updated" : "文件恢复设置已更新",
"Could not update file recovery" : "不能更新文件恢复",
@@ -19,6 +26,7 @@ OC.L10N.register(
"Missing requirements." : "必填项未填写。",
"Following users are not set up for encryption:" : "以下用户还没有设置加密:",
"Go directly to your %spersonal settings%s." : "直接访问您的%s个人设置%s。",
+ "Server-side Encryption" : "服务器端加密",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了,但是你的加密密钥没有初始化,请重新登出登录系统一次。",
"Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥(允许你在密码丢失后恢复文件):",
"Recovery key password" : "恢复密钥密码",
diff --git a/apps/files_encryption/l10n/zh_CN.json b/apps/files_encryption/l10n/zh_CN.json
index 65ad983c78c..0a98a5d858b 100644
--- a/apps/files_encryption/l10n/zh_CN.json
+++ b/apps/files_encryption/l10n/zh_CN.json
@@ -1,10 +1,17 @@
{ "translations": {
"Unknown error" : "未知错误",
+ "Missing recovery key password" : "丢失的回复密钥",
+ "Please repeat the recovery key password" : "请替换恢复密钥",
"Recovery key successfully enabled" : "恢复密钥成功启用",
"Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码!",
"Recovery key successfully disabled" : "恢复密钥成功禁用",
+ "Please provide the old recovery password" : "请提供原来的恢复密码",
+ "Please provide a new recovery password" : "请提供一个新的恢复密码",
+ "Please repeat the new recovery password" : "请替换新的恢复密码",
"Password successfully changed." : "密码修改成功。",
"Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+ "Could not update the private key password." : "不能更新私有密钥。",
+ "The old password was not correct, please try again." : "原始密码错误,请重试。",
"Private key password successfully updated." : "私钥密码成功更新。",
"File recovery settings updated" : "文件恢复设置已更新",
"Could not update file recovery" : "不能更新文件恢复",
@@ -17,6 +24,7 @@
"Missing requirements." : "必填项未填写。",
"Following users are not set up for encryption:" : "以下用户还没有设置加密:",
"Go directly to your %spersonal settings%s." : "直接访问您的%s个人设置%s。",
+ "Server-side Encryption" : "服务器端加密",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了,但是你的加密密钥没有初始化,请重新登出登录系统一次。",
"Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥(允许你在密码丢失后恢复文件):",
"Recovery key password" : "恢复密钥密码",
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 553c52e72fe..ae9f0af4890 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -293,8 +293,8 @@ class Helper {
public static function getUserFromPath($path) {
$split = self::splitPath($path);
- if (count($split) > 3 && (
- $split[2] === 'files' || $split[2] === 'files_versions' || $split[2] === 'cache')) {
+ if (count($split) > 2 && (
+ $split[2] === 'files' || $split[2] === 'files_versions' || $split[2] === 'cache' || $split[2] === 'files_trashbin')) {
$user = $split[1];
diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php
index 1bab1dfe4a5..7a036ade3fc 100644
--- a/apps/files_encryption/lib/migration.php
+++ b/apps/files_encryption/lib/migration.php
@@ -40,6 +40,20 @@ class Migration {
}
public function reorganizeFolderStructure() {
+ $this->reorganizeSystemFolderStructure();
+
+ $limit = 500;
+ $offset = 0;
+ do {
+ $users = \OCP\User::getUsers('', $limit, $offset);
+ foreach ($users as $user) {
+ $this->reorganizeFolderStructureForUser($user);
+ }
+ $offset += $limit;
+ } while(count($users) >= $limit);
+ }
+
+ public function reorganizeSystemFolderStructure() {
$this->createPathForKeys('/files_encryption');
@@ -60,27 +74,28 @@ class Migration {
$this->view->deleteAll('/owncloud_private_key');
$this->view->deleteAll('/files_encryption/share-keys');
$this->view->deleteAll('/files_encryption/keyfiles');
+ }
- $users = \OCP\User::getUsers();
- foreach ($users as $user) {
- // backup all keys
- if ($this->backupUserKeys($user)) {
- // create new 'key' folder
- $this->view->mkdir($user . '/files_encryption/keys');
- // rename users private key
- $this->renameUsersPrivateKey($user);
- // rename file keys
- $path = $user . '/files_encryption/keyfiles';
- $this->renameFileKeys($user, $path);
- $trashPath = $user . '/files_trashbin/keyfiles';
- if (\OC_App::isEnabled('files_trashbin') && $this->view->is_dir($trashPath)) {
- $this->renameFileKeys($user, $trashPath, true);
- $this->view->deleteAll($trashPath);
- $this->view->deleteAll($user . '/files_trashbin/share-keys');
- }
- // delete old folders
- $this->deleteOldKeys($user);
+
+ public function reorganizeFolderStructureForUser($user) {
+ // backup all keys
+ \OC_Util::setupFS($user);
+ if ($this->backupUserKeys($user)) {
+ // create new 'key' folder
+ $this->view->mkdir($user . '/files_encryption/keys');
+ // rename users private key
+ $this->renameUsersPrivateKey($user);
+ // rename file keys
+ $path = $user . '/files_encryption/keyfiles';
+ $this->renameFileKeys($user, $path);
+ $trashPath = $user . '/files_trashbin/keyfiles';
+ if (\OC_App::isEnabled('files_trashbin') && $this->view->is_dir($trashPath)) {
+ $this->renameFileKeys($user, $trashPath, true);
+ $this->view->deleteAll($trashPath);
+ $this->view->deleteAll($user . '/files_trashbin/share-keys');
}
+ // delete old folders
+ $this->deleteOldKeys($user);
}
}
@@ -246,11 +261,7 @@ class Migration {
if (substr($file, 0, strlen($filename) +1) === $filename . '.') {
$uid = $this->getUidFromShareKey($file, $filename, $trash);
- if ($uid === $this->public_share_key_id ||
- $uid === $this->recovery_key_id ||
- \OCP\User::userExists($uid)) {
- $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey');
- }
+ $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey');
}
}
@@ -277,6 +288,4 @@ class Migration {
}
}
}
-
-
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b300999ff24..14d0a0bc4b9 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1109,7 +1109,7 @@ class Util {
// Find out who, if anyone, is sharing the file
$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner);
$userIds = \array_merge($userIds, $result['users']);
- if ($result['public']) {
+ if ($result['public'] || $result['remote']) {
$userIds[] = $this->publicShareKeyId;
}
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index 62fdb80d671..3c82b941347 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -219,6 +219,7 @@ class TestHelper extends TestCase {
return array(
array('/' . self::TEST_ENCRYPTION_HELPER_USER1 . '/files/foo.txt', self::TEST_ENCRYPTION_HELPER_USER1),
array('//' . self::TEST_ENCRYPTION_HELPER_USER2 . '/files_versions/foo.txt', self::TEST_ENCRYPTION_HELPER_USER2),
+ array('/' . self::TEST_ENCRYPTION_HELPER_USER1 . '/files_trashbin/', self::TEST_ENCRYPTION_HELPER_USER1),
array(self::TEST_ENCRYPTION_HELPER_USER1 . '//cache/foo/bar.txt', self::TEST_ENCRYPTION_HELPER_USER1),
);
}
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 8ecdbabed39..a59838ede1c 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -89,6 +89,8 @@ class Share extends TestCase {
// login as first user
self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1);
+
+ $this->createMocks();
}
protected function tearDown() {
@@ -99,6 +101,8 @@ class Share extends TestCase {
\OC_App::disable('files_trashbin');
}
+ $this->restoreHttpHelper();
+
parent::tearDown();
}
@@ -115,18 +119,43 @@ class Share extends TestCase {
parent::tearDownAfterClass();
}
- /**
- * @medium
- */
- function testDeclineServer2ServerShare() {
-
+ private function createMocks() {
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
$certificateManager = $this->getMock('\OCP\ICertificateManager');
$httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper')
->setConstructorArgs(array($config, $certificateManager))
->getMock();
- $httpHelperMock->expects($this->once())->method('post')->with($this->anything())->will($this->returnValue(true));
+ $httpHelperMock->expects($this->any())->method('post')->with($this->anything())->will($this->returnValue(array('success' => true, 'result' => "{'ocs' : { 'meta' : { 'statuscode' : 100 }}}")));
+
+ $this->registerHttpHelper($httpHelperMock);
+ }
+
+ /**
+ * Register an http helper mock for testing purposes.
+ * @param $httpHelper http helper mock
+ */
+ private function registerHttpHelper($httpHelper) {
+ $this->oldHttpHelper = \OC::$server->query('HTTPHelper');
+ \OC::$server->registerService('HTTPHelper', function ($c) use ($httpHelper) {
+ return $httpHelper;
+ });
+ }
+
+ /**
+ * Restore the original http helper
+ */
+ private function restoreHttpHelper() {
+ $oldHttpHelper = $this->oldHttpHelper;
+ \OC::$server->registerService('HTTPHelper', function ($c) use ($oldHttpHelper) {
+ return $oldHttpHelper;
+ });
+ }
+
+ /**
+ * @medium
+ */
+ function testDeclineServer2ServerShare() {
self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1);
@@ -134,7 +163,7 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// get the file info from previous created file
$fileInfo = $this->view->getFileInfo(
@@ -167,11 +196,9 @@ class Share extends TestCase {
$share = $query->fetch();
- $this->registerHttpHelper($httpHelperMock);
$_POST['token'] = $token;
$s2s = new \OCA\Files_Sharing\API\Server2Server();
$s2s->declineShare(array('id' => $share['id']));
- $this->restoreHttpHelper();
$this->assertFalse($this->view->file_exists(
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
@@ -179,28 +206,6 @@ class Share extends TestCase {
}
-
- /**
- * Register an http helper mock for testing purposes.
- * @param $httpHelper http helper mock
- */
- private function registerHttpHelper($httpHelper) {
- $this->oldHttpHelper = \OC::$server->query('HTTPHelper');
- \OC::$server->registerService('HTTPHelper', function ($c) use ($httpHelper) {
- return $httpHelper;
- });
- }
-
- /**
- * Restore the original http helper
- */
- private function restoreHttpHelper() {
- $oldHttpHelper = $this->oldHttpHelper;
- \OC::$server->registerService('HTTPHelper', function ($c) use ($oldHttpHelper) {
- return $oldHttpHelper;
- });
- }
-
/**
* @medium
* @param bool $withTeardown
@@ -213,7 +218,7 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -224,7 +229,7 @@ class Share extends TestCase {
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// check if the unencrypted file size is stored
$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
@@ -407,7 +412,7 @@ class Share extends TestCase {
. $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -418,7 +423,7 @@ class Share extends TestCase {
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// re-enable the file proxy
\OC_FileProxy::$enabled = $proxyStatus;
@@ -496,7 +501,7 @@ class Share extends TestCase {
. $this->subfolder);
// check if we have a valid file info
- $this->assertTrue($fileInfoSubFolder instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfoSubFolder);
// re-enable the file proxy
\OC_FileProxy::$enabled = $proxyStatus;
@@ -530,7 +535,7 @@ class Share extends TestCase {
. $this->subsubfolder . '/' . $this->filename);
// check if we have fileInfos
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// share the file with user3
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER4, \OCP\Constants::PERMISSION_ALL);
@@ -607,6 +612,62 @@ class Share extends TestCase {
}
+ function testRemoteShareFile() {
+ // login as admin
+ //self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1);
+
+ // save file with content
+ $cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
+
+ // test that data was successfully written
+ $this->assertInternalType('int', $cryptedFile);
+
+ // disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
+
+ // get the file info from previous created file
+ $fileInfo = $this->view->getFileInfo(
+ '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+ // check if we have a valid file info
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
+
+ // check if the unencrypted file size is stored
+ $this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+ // re-enable the file proxy
+ \OC_FileProxy::$enabled = $proxyStatus;
+
+ // share the file
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_REMOTE, 'user1@server1', \OCP\Constants::PERMISSION_ALL);
+
+ $publicShareKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'publicShareKeyId');
+
+ // check if share key for public exists
+ $this->assertTrue($this->view->file_exists(
+ '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+ . $this->filename . '/' . $publicShareKeyId . '.shareKey'));
+
+ // unshare the file
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_REMOTE, 'user1@server1');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+ . $this->filename . '/' . $publicShareKeyId . '.shareKey'));
+
+ // cleanup
+ $this->view->chroot('/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
+ $this->view->unlink($this->filename);
+ $this->view->chroot('/');
+
+ // check if share key not exists
+ $this->assertFalse($this->view->file_exists(
+ '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+ . $this->filename . '/' . self::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+ }
+
function testPublicShareFile() {
// login as admin
self::loginHelper(self::TEST_ENCRYPTION_SHARE_USER1);
@@ -615,7 +676,7 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -626,7 +687,7 @@ class Share extends TestCase {
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// check if the unencrypted file size is stored
$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
@@ -693,7 +754,7 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -704,7 +765,7 @@ class Share extends TestCase {
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// check if the unencrypted file size is stored
$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
@@ -799,8 +860,8 @@ class Share extends TestCase {
. $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile1));
- $this->assertTrue(is_int($cryptedFile2));
+ $this->assertInternalType('int', $cryptedFile1);
+ $this->assertInternalType('int', $cryptedFile2);
// check if share key for admin and recovery exists
$this->assertTrue($this->view->file_exists(
@@ -906,8 +967,8 @@ class Share extends TestCase {
. $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile1));
- $this->assertTrue(is_int($cryptedFile2));
+ $this->assertInternalType('int', $cryptedFile1);
+ $this->assertInternalType('int', $cryptedFile2);
// check if share key for user and recovery exists
$this->assertTrue($this->view->file_exists(
@@ -994,7 +1055,7 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -1005,7 +1066,7 @@ class Share extends TestCase {
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// check if the unencrypted file size is stored
$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
@@ -1077,14 +1138,14 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// get the file info from previous created file
$fileInfo = $this->view->getFileInfo(
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// share the file
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
@@ -1143,14 +1204,14 @@ class Share extends TestCase {
$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// get the file info from previous created file
$fileInfo = $this->view->getFileInfo(
'/' . self::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if we have a valid file info
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// share the file
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, self::TEST_ENCRYPTION_SHARE_GROUP1, \OCP\Constants::PERMISSION_ALL);
@@ -1222,7 +1283,7 @@ class Share extends TestCase {
$cryptedFile = \OC\Files\Filesystem::file_put_contents($folder . $filename, $this->dataShort);
// Test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// Get file decrypted contents
$decrypt = \OC\Files\Filesystem::file_get_contents($folder . $filename);
@@ -1234,7 +1295,7 @@ class Share extends TestCase {
// get the file info from previous created file
$fileInfo = \OC\Files\Filesystem::getFileInfo('/newfolder');
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// share the folder
\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
@@ -1280,7 +1341,7 @@ class Share extends TestCase {
$cryptedFile = \OC\Files\Filesystem::file_put_contents($folder . $filename, $this->dataShort);
// Test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ $this->assertInternalType('int', $cryptedFile);
// Get file decrypted contents
$decrypt = \OC\Files\Filesystem::file_get_contents($folder . $filename);
@@ -1292,7 +1353,7 @@ class Share extends TestCase {
// get the file info from previous created file
$fileInfo = \OC\Files\Filesystem::getFileInfo($folder);
- $this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
+ $this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
// share the folder
\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
@@ -1323,4 +1384,4 @@ class Share extends TestCase {
\OC\Files\Filesystem::unlink($folder);
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index b759c8e32fd..2704a9752cc 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -93,6 +93,8 @@ class Trashbin extends TestCase {
// cleanup test user
\OC_User::deleteUser(self::TEST_ENCRYPTION_TRASHBIN_USER1);
+ \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
+
parent::tearDownAfterClass();
}
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 101c224c5f5..93689f78c52 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -32,12 +32,18 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
margin-right: 3px;
}
+#externalStorage td.configuration label {
+ min-width: 144px; /* 130px plus 2x7px padding */
+ display: inline-block;
+ margin-right: 6px;
+}
+
+
#externalStorage td.applicable div.chzn-container {
position: relative;
top: 3px;
}
-
#externalStorage td.status .success {
border-radius: 50%;
}
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
index dabf8715e82..f1a773b21f9 100644
--- a/apps/files_external/l10n/bg_BG.js
+++ b/apps/files_external/l10n/bg_BG.js
@@ -56,6 +56,8 @@ OC.L10N.register(
"<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>Note:</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>Note:</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>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+ "No external storage configured" : "Няма настроено външно дисково пространство",
+ "You can configure external storages in the personal settings" : "Можеш да промениш виншните дискови пространства в личните си настройки",
"Name" : "Име",
"Storage type" : "Тип дисково пространство",
"Scope" : "Обхват",
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
index 5dc9e8d60a2..b404afdae5e 100644
--- a/apps/files_external/l10n/bg_BG.json
+++ b/apps/files_external/l10n/bg_BG.json
@@ -54,6 +54,8 @@
"<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>Note:</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>Note:</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>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+ "No external storage configured" : "Няма настроено външно дисково пространство",
+ "You can configure external storages in the personal settings" : "Можеш да промениш виншните дискови пространства в личните си настройки",
"Name" : "Име",
"Storage type" : "Тип дисково пространство",
"Scope" : "Обхват",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index f188e8dc9fe..b5775a0b0ef 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -27,7 +27,7 @@ OC.L10N.register(
"Username" : "Benutzername",
"Password" : "Passwort",
"Remote subfolder" : "Remote subfolder",
- "Secure ftps://" : "Sicherer FTPS://",
+ "Secure ftps://" : "Sicherer ftps://",
"Client ID" : "Client-ID",
"Client secret" : "Geheime Zeichenkette des Client",
"OpenStack Object Storage" : "Openstack-Objektspeicher",
@@ -49,7 +49,7 @@ OC.L10N.register(
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index d9d8bd70c77..e6501b57a7d 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -25,7 +25,7 @@
"Username" : "Benutzername",
"Password" : "Passwort",
"Remote subfolder" : "Remote subfolder",
- "Secure ftps://" : "Sicherer FTPS://",
+ "Secure ftps://" : "Sicherer ftps://",
"Client ID" : "Client-ID",
"Client secret" : "Geheime Zeichenkette des Client",
"OpenStack Object Storage" : "Openstack-Objektspeicher",
@@ -47,7 +47,7 @@
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 17061d5bdbd..9122a8caa0a 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -27,7 +27,7 @@ OC.L10N.register(
"Username" : "Benutzername",
"Password" : "Passwort",
"Remote subfolder" : "Entfernter Unterordner:",
- "Secure ftps://" : "Sicherer FTPS://",
+ "Secure ftps://" : "Sicheres ftps://",
"Client ID" : "Client-ID",
"Client secret" : "Geheime Zeichenkette des Client",
"OpenStack Object Storage" : "Openstack-Objektspeicher",
@@ -42,14 +42,14 @@ OC.L10N.register(
"SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
"Username as share" : "Benutzername als Freigabe",
"URL" : "Adresse",
- "Secure https://" : "Sicherer HTTPS://",
+ "Secure https://" : "Sicheres https://",
"Access granted" : "Zugriff gestattet",
"Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
"Grant access" : "Zugriff gestatten",
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index 77bb3b19c49..5c8ba8a89ee 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -25,7 +25,7 @@
"Username" : "Benutzername",
"Password" : "Passwort",
"Remote subfolder" : "Entfernter Unterordner:",
- "Secure ftps://" : "Sicherer FTPS://",
+ "Secure ftps://" : "Sicheres ftps://",
"Client ID" : "Client-ID",
"Client secret" : "Geheime Zeichenkette des Client",
"OpenStack Object Storage" : "Openstack-Objektspeicher",
@@ -40,14 +40,14 @@
"SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
"Username as share" : "Benutzername als Freigabe",
"URL" : "Adresse",
- "Secure https://" : "Sicherer HTTPS://",
+ "Secure https://" : "Sicheres https://",
"Access granted" : "Zugriff gestattet",
"Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
"Grant access" : "Zugriff gestatten",
"Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
"Personal" : "Persönlich",
"System" : "System",
- "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
"(group)" : "(group)",
"Saved" : "Gespeichert",
"<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index ba31abd802f..1000a6d9303 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -57,6 +57,8 @@ OC.L10N.register(
"<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. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+ "No external storage configured" : "Δεν έχει ρυθμιστεί κανένα εξωτερικό μέσο αποθήκευσης",
+ "You can configure external storages in the personal settings" : "Μπορείτε να ρυθμίσετε εξωτερικά μέσα αποθήκευσης στις προσωπικές ρυθμίσεις",
"Name" : "Όνομα",
"Storage type" : "Τύπος αποθηκευτικού χώρου",
"Scope" : "Εύρος",
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index 322949e30a1..b38b81c86d2 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -55,6 +55,8 @@
"<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. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+ "No external storage configured" : "Δεν έχει ρυθμιστεί κανένα εξωτερικό μέσο αποθήκευσης",
+ "You can configure external storages in the personal settings" : "Μπορείτε να ρυθμίσετε εξωτερικά μέσα αποθήκευσης στις προσωπικές ρυθμίσεις",
"Name" : "Όνομα",
"Storage type" : "Τύπος αποθηκευτικού χώρου",
"Scope" : "Εύρος",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index bab1bd606d3..bb1631d7ead 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -27,7 +27,7 @@ OC.L10N.register(
"Username" : "Nombre de usuario",
"Password" : "Contraseña",
"Remote subfolder" : "Subcarpeta remota",
- "Secure ftps://" : "Secure ftps://",
+ "Secure ftps://" : "—Seguro— ftps://",
"Client ID" : "ID de Cliente",
"Client secret" : "Cliente secreto",
"OpenStack Object Storage" : "OpenStack Object Storage",
@@ -39,10 +39,10 @@ OC.L10N.register(
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
"Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
"Share" : "Compartir",
- "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
+ "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
"Username as share" : "Nombre de usuario como compartir",
"URL" : "URL",
- "Secure https://" : "Secure https://",
+ "Secure https://" : "—Seguro— https://",
"Access granted" : "Acceso concedido",
"Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
"Grant access" : "Conceder acceso",
@@ -54,9 +54,9 @@ OC.L10N.register(
"Saved" : "Guardado",
"<b>Note:</b> " : "<b>Nota:</b> ",
"and" : "y",
- "<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 soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
- "<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 soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
- "<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á instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
+ "<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 soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
+ "<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 soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
+ "<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á instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
"No external storage configured" : "No hay ningún almacenamiento externo configurado",
"You can configure external storages in the personal settings" : "Puede configurar almacenamientos externos en su configuración personal",
"Name" : "Nombre",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index 03f9b15431e..7c86b244c32 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -25,7 +25,7 @@
"Username" : "Nombre de usuario",
"Password" : "Contraseña",
"Remote subfolder" : "Subcarpeta remota",
- "Secure ftps://" : "Secure ftps://",
+ "Secure ftps://" : "—Seguro— ftps://",
"Client ID" : "ID de Cliente",
"Client secret" : "Cliente secreto",
"OpenStack Object Storage" : "OpenStack Object Storage",
@@ -37,10 +37,10 @@
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
"Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
"Share" : "Compartir",
- "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
+ "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
"Username as share" : "Nombre de usuario como compartir",
"URL" : "URL",
- "Secure https://" : "Secure https://",
+ "Secure https://" : "—Seguro— https://",
"Access granted" : "Acceso concedido",
"Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
"Grant access" : "Conceder acceso",
@@ -52,9 +52,9 @@
"Saved" : "Guardado",
"<b>Note:</b> " : "<b>Nota:</b> ",
"and" : "y",
- "<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 soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
- "<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 soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
- "<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á instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
+ "<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 soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
+ "<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 soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
+ "<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á instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
"No external storage configured" : "No hay ningún almacenamiento externo configurado",
"You can configure external storages in the personal settings" : "Puede configurar almacenamientos externos en su configuración personal",
"Name" : "Nombre",
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index 8da8ca68263..0127452f697 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -52,9 +52,12 @@ OC.L10N.register(
"(group)" : "(taldea)",
"Saved" : "Gordeta",
"<b>Note:</b> " : "<b>Oharra:</b>",
+ "and" : "eta",
"<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>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<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>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+ "No external storage configured" : "Ez da kanpo biltegiratzerik konfiguratu",
+ "You can configure external storages in the personal settings" : "Ezarpen pertsonaletan kanpo biltegiratzeak konfigura ditzazkezu",
"Name" : "Izena",
"Storage type" : "Biltegiratze mota",
"External Storage" : "Kanpoko biltegiratzea",
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index 7ae84c8dbd3..af7f8e4016b 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -50,9 +50,12 @@
"(group)" : "(taldea)",
"Saved" : "Gordeta",
"<b>Note:</b> " : "<b>Oharra:</b>",
+ "and" : "eta",
"<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>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<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>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+ "No external storage configured" : "Ez da kanpo biltegiratzerik konfiguratu",
+ "You can configure external storages in the personal settings" : "Ezarpen pertsonaletan kanpo biltegiratzeak konfigura ditzazkezu",
"Name" : "Izena",
"Storage type" : "Biltegiratze mota",
"External Storage" : "Kanpoko biltegiratzea",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 587db2db2a1..4c343daf902 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -13,7 +13,7 @@ OC.L10N.register(
"Key" : "キー",
"Secret" : "シークレットキー",
"Bucket" : "バケット名",
- "Amazon S3 and compliant" : "Amazon S3 と互換ストレージ",
+ "Amazon S3 and compliant" : "Amazon S3や互換ストレージ",
"Access Key" : "アクセスキー",
"Secret Key" : "シークレットキー",
"Hostname" : "ホスト名",
@@ -39,7 +39,7 @@ OC.L10N.register(
"URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
"Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
"Share" : "共有",
- "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用",
+ "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
"Username as share" : "共有名",
"URL" : "URL",
"Secure https://" : "セキュア https://",
@@ -57,6 +57,7 @@ OC.L10N.register(
"<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をマウントできません。このシステムの管理者にインストールをお願いしてください。",
+ "No external storage configured" : "外部ストレージは設定されていません",
"You can configure external storages in the personal settings" : "個人設定で外部ストレージを設定することができます。",
"Name" : "名前",
"Storage type" : "ストレージ種別",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 9808e3849c6..77aff58b9f7 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -11,7 +11,7 @@
"Key" : "キー",
"Secret" : "シークレットキー",
"Bucket" : "バケット名",
- "Amazon S3 and compliant" : "Amazon S3 と互換ストレージ",
+ "Amazon S3 and compliant" : "Amazon S3や互換ストレージ",
"Access Key" : "アクセスキー",
"Secret Key" : "シークレットキー",
"Hostname" : "ホスト名",
@@ -37,7 +37,7 @@
"URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
"Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
"Share" : "共有",
- "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用",
+ "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
"Username as share" : "共有名",
"URL" : "URL",
"Secure https://" : "セキュア https://",
@@ -55,6 +55,7 @@
"<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をマウントできません。このシステムの管理者にインストールをお願いしてください。",
+ "No external storage configured" : "外部ストレージは設定されていません",
"You can configure external storages in the personal settings" : "個人設定で外部ストレージを設定することができます。",
"Name" : "名前",
"Storage type" : "ストレージ種別",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 19e0051e1e3..1fa2f9a8c6e 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -57,6 +57,7 @@ OC.L10N.register(
"<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>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
"<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>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
+ "No external storage configured" : "Eksternt lager er ikke konfigurert",
"You can configure external storages in the personal settings" : "Du kan konfigurerer eksterne lagre i personlige innstillinger",
"Name" : "Navn",
"Storage type" : "Lagringstype",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index 0b707decbea..6ff246ee2ef 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -55,6 +55,7 @@
"<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>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
"<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>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
+ "No external storage configured" : "Eksternt lager er ikke konfigurert",
"You can configure external storages in the personal settings" : "Du kan konfigurerer eksterne lagre i personlige innstillinger",
"Name" : "Navn",
"Storage type" : "Lagringstype",
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index b1e9f0812f5..0d35cb81dc7 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -1,9 +1,9 @@
OC.L10N.register(
"files_external",
{
- "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.",
- "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токена доступа. Проверьте правильность вашего ключа приложения и секретного ключа.",
- "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и пароль для Dropbox.",
+ "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов запроса прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.",
+ "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов доступа прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.",
+ "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.",
"Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
"Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
"External storage" : "Внешнее хранилище",
@@ -38,7 +38,7 @@ OC.L10N.register(
"Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
"Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
- "Share" : "Поделиться",
+ "Share" : "Общий доступ",
"SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
"Username as share" : "Имя пользователя в качестве имени общего ресурса",
"URL" : "Ссылка",
@@ -57,8 +57,8 @@ OC.L10N.register(
"<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 невозможно. Пожалуйста, обратитесь к системному администратору.",
- "No external storage configured" : "Нет внешних носителей",
- "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних носителей в личных настройках",
+ "No external storage configured" : "Нет внешних хранилищ",
+ "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних хранилищ в личных настройках",
"Name" : "Имя",
"Storage type" : "Тип хранилища",
"Scope" : "Область",
@@ -68,7 +68,7 @@ OC.L10N.register(
"Available for" : "Доступно для",
"Add storage" : "Добавить хранилище",
"Delete" : "Удалить",
- "Enable User External Storage" : "Включить пользовательские внешние носители",
+ "Enable User External Storage" : "Включить пользовательские внешние хранилища",
"Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных"
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index 7a0e9aa95ca..537a178853a 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -1,7 +1,7 @@
{ "translations": {
- "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.",
- "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токена доступа. Проверьте правильность вашего ключа приложения и секретного ключа.",
- "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и пароль для Dropbox.",
+ "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов запроса прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.",
+ "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов доступа прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.",
+ "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.",
"Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
"Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
"External storage" : "Внешнее хранилище",
@@ -36,7 +36,7 @@
"Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
"Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
- "Share" : "Поделиться",
+ "Share" : "Общий доступ",
"SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
"Username as share" : "Имя пользователя в качестве имени общего ресурса",
"URL" : "Ссылка",
@@ -55,8 +55,8 @@
"<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 невозможно. Пожалуйста, обратитесь к системному администратору.",
- "No external storage configured" : "Нет внешних носителей",
- "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних носителей в личных настройках",
+ "No external storage configured" : "Нет внешних хранилищ",
+ "You can configure external storages in the personal settings" : "Вы можете изменить параметры внешних хранилищ в личных настройках",
"Name" : "Имя",
"Storage type" : "Тип хранилища",
"Scope" : "Область",
@@ -66,7 +66,7 @@
"Available for" : "Доступно для",
"Add storage" : "Добавить хранилище",
"Delete" : "Удалить",
- "Enable User External Storage" : "Включить пользовательские внешние носители",
+ "Enable User External Storage" : "Включить пользовательские внешние хранилища",
"Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js
index 67de616dfc6..e48c31008b7 100644
--- a/apps/files_external/l10n/sk_SK.js
+++ b/apps/files_external/l10n/sk_SK.js
@@ -33,7 +33,7 @@ OC.L10N.register(
"OpenStack Object Storage" : "OpenStack Object Storage",
"Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
"API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
- "Tenantname (required for OpenStack Object Storage)" : "Tenantname (požadované pre OpenStack Object Storage)",
+ "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
"Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
"Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
@@ -53,9 +53,12 @@ OC.L10N.register(
"(group)" : "(skupina)",
"Saved" : "Uložené",
"<b>Note:</b> " : "<b>Poznámka:</b> ",
+ "and" : "a",
"<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>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
"<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>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+ "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované",
+ "You can configure external storages in the personal settings" : "Externé úložisko si môžete nastaviť v osobnom nastavení",
"Name" : "Názov",
"Storage type" : "Typ úložiska",
"Scope" : "Rozsah",
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
index 3ad132167df..e0d6c41b066 100644
--- a/apps/files_external/l10n/sk_SK.json
+++ b/apps/files_external/l10n/sk_SK.json
@@ -31,7 +31,7 @@
"OpenStack Object Storage" : "OpenStack Object Storage",
"Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
"API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
- "Tenantname (required for OpenStack Object Storage)" : "Tenantname (požadované pre OpenStack Object Storage)",
+ "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
"Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
"Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
@@ -51,9 +51,12 @@
"(group)" : "(skupina)",
"Saved" : "Uložené",
"<b>Note:</b> " : "<b>Poznámka:</b> ",
+ "and" : "a",
"<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>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
"<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>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+ "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované",
+ "You can configure external storages in the personal settings" : "Externé úložisko si môžete nastaviť v osobnom nastavení",
"Name" : "Názov",
"Storage type" : "Typ úložiska",
"Scope" : "Rozsah",
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 823c0bcbfc1..ddfab439879 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -882,6 +882,11 @@ class OC_Mount_Config {
return hash('md5', $data);
}
+ /**
+ * Add storage id to the storage configurations that did not have any.
+ *
+ * @param string $user user for which to process storage configs
+ */
private static function addStorageIdToConfig($user) {
$config = self::readData($user);
@@ -899,13 +904,35 @@ class OC_Mount_Config {
}
}
+ /**
+ * Get storage id from the numeric storage id and set
+ * it into the given options argument. Only do this
+ * if there was no storage id set yet.
+ *
+ * This might also fail if a storage wasn't fully configured yet
+ * and couldn't be mounted, in which case this will simply return false.
+ *
+ * @param array $options storage options
+ *
+ * @return bool true if the storage id was added, false otherwise
+ */
private static function addStorageId(&$options) {
if (isset($options['storage_id'])) {
return false;
}
+
$class = $options['class'];
- /** @var \OC\Files\Storage\Storage $storage */
- $storage = new $class($options['options']);
+ try {
+ /** @var \OC\Files\Storage\Storage $storage */
+ $storage = new $class($options['options']);
+ // TODO: introduce StorageConfigException
+ } catch (\Exception $e) {
+ // storage might not be fully configured yet (ex: Dropbox)
+ // note that storage instances aren't supposed to open any connections
+ // in the constructor, so this exception is likely to be a config exception
+ return false;
+ }
+
$options['storage_id'] = $storage->getCache()->getNumericStorageId();
return true;
}
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 342f020d3a9..f288d02705c 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -21,6 +21,12 @@
*/
class Test_Mount_Config_Dummy_Storage {
+ public function __construct($params) {
+ if (isset($params['simulateFail']) && $params['simulateFail'] == true) {
+ throw new \Exception('Simulated config validation fail');
+ }
+ }
+
public function test() {
return true;
}
@@ -82,6 +88,13 @@ class Test_Mount_Config extends \Test\TestCase {
protected function setUp() {
parent::setUp();
+ OC_Mount_Config::registerBackend('Test_Mount_Config_Dummy_Storage', array(
+ 'backend' => 'dummy',
+ 'priority' => 150,
+ 'configuration' => array()
+ )
+ );
+
\OC_User::createUser(self::TEST_USER1, self::TEST_USER1);
\OC_User::createUser(self::TEST_USER2, self::TEST_USER2);
@@ -184,7 +197,13 @@ class Test_Mount_Config extends \Test\TestCase {
$applicable = 'all';
$isPersonal = false;
- $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+ $storageOptions = array(
+ 'host' => 'localhost',
+ 'user' => 'testuser',
+ 'password' => '12345',
+ );
+
+ $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', $storageOptions, $mountType, $applicable, $isPersonal));
$config = $this->readGlobalConfig();
$this->assertEquals(1, count($config));
@@ -205,7 +224,13 @@ class Test_Mount_Config extends \Test\TestCase {
$applicable = self::TEST_USER1;
$isPersonal = true;
- $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+ $storageOptions = array(
+ 'host' => 'localhost',
+ 'user' => 'testuser',
+ 'password' => '12345',
+ );
+
+ $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', $storageOptions, $mountType, $applicable, $isPersonal));
$config = $this->readUserConfig();
$this->assertEquals(1, count($config));
@@ -236,8 +261,14 @@ class Test_Mount_Config extends \Test\TestCase {
implode(',', array_keys($this->allBackends))
);
+ $storageOptions = array(
+ 'host' => 'localhost',
+ 'user' => 'testuser',
+ 'password' => '12345',
+ );
+
// non-local but forbidden
- $this->assertFalse(OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+ $this->assertFalse(OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', $storageOptions, $mountType, $applicable, $isPersonal));
$this->assertFalse(file_exists($this->userHome . '/mount.json'));
}
@@ -629,7 +660,8 @@ class Test_Mount_Config extends \Test\TestCase {
'host' => 'someost',
'user' => 'someuser',
'password' => 'somepassword',
- 'root' => 'someroot'
+ 'root' => 'someroot',
+ 'share' => '',
);
// add mount point as "test" user
@@ -872,7 +904,8 @@ class Test_Mount_Config extends \Test\TestCase {
'host' => 'somehost',
'user' => 'someuser',
'password' => 'somepassword',
- 'root' => 'someroot'
+ 'root' => 'someroot',
+ 'share' => '',
);
// Add mount points
@@ -908,7 +941,8 @@ class Test_Mount_Config extends \Test\TestCase {
'host' => 'somehost',
'user' => 'someuser',
'password' => 'somepassword',
- 'root' => 'someroot'
+ 'root' => 'someroot',
+ 'share' => '',
);
$this->assertTrue(
@@ -954,7 +988,8 @@ class Test_Mount_Config extends \Test\TestCase {
'host' => 'somehost',
'user' => 'someuser',
'password' => 'somepassword',
- 'root' => 'someroot'
+ 'root' => 'someroot',
+ 'share' => '',
);
// Create personal mount point
@@ -982,4 +1017,29 @@ class Test_Mount_Config extends \Test\TestCase {
$this->assertEquals($mountConfig,
$mountPointsOther['/'.self::TEST_USER1.'/files/ext']['options']);
}
+
+ public function testAllowWritingIncompleteConfigIfStorageContructorFails() {
+ $storageClass = 'Test_Mount_Config_Dummy_Storage';
+ $mountType = 'user';
+ $applicable = 'all';
+ $isPersonal = false;
+
+ $this->assertTrue(
+ OC_Mount_Config::addMountPoint(
+ '/ext',
+ $storageClass,
+ array('simulateFail' => true),
+ $mountType,
+ $applicable,
+ $isPersonal
+ )
+ );
+
+ // config can be retrieved afterwards
+ $mounts = OC_Mount_Config::getSystemMountPoints();
+ $this->assertEquals(1, count($mounts));
+
+ // no storage id was set
+ $this->assertFalse(isset($mounts[0]['storage_id']));
+ }
}
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index 1a709eda07c..30c1f38801e 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -34,28 +34,78 @@ $externalManager = new \OCA\Files_Sharing\External\Manager(
\OC::$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- \OC::$server->getUserSession(),
- \OC::$server->getHTTPHelper()
+ \OC::$server->getHTTPHelper(),
+ \OC::$server->getUserSession()->getUser()->getUID()
);
$name = OCP\Files::buildNotExistingFileName('/', $name);
// check for ssl cert
if (substr($remote, 0, 5) === 'https' and !OC_Util::getUrlContent($remote)) {
- \OCP\JSON::error(array('data' => array('message' => $l->t("Invalid or untrusted SSL certificate"))));
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Invalid or untrusted SSL certificate'))));
exit;
} else {
$mount = $externalManager->addShare($remote, $token, $password, $name, $owner, true);
+
/**
* @var \OCA\Files_Sharing\External\Storage $storage
*/
$storage = $mount->getStorage();
+ try {
+ // check if storage exists
+ $storage->checkStorageAvailability();
+ } catch (\OCP\Files\StorageInvalidException $e) {
+ // note: checkStorageAvailability will already remove the invalid share
+ \OCP\Util::writeLog(
+ 'files_sharing',
+ 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+ \OCP\Util::DEBUG
+ );
+ \OCP\JSON::error(
+ array(
+ 'data' => array(
+ 'message' => $l->t('Could not authenticate to remote share, password might be wrong')
+ )
+ )
+ );
+ exit();
+ } catch (\Exception $e) {
+ \OCP\Util::writeLog(
+ 'files_sharing',
+ 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+ \OCP\Util::DEBUG
+ );
+ $externalManager->removeShare($mount->getMountPoint());
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Storage not valid'))));
+ exit();
+ }
$result = $storage->file_exists('');
if ($result) {
- $storage->getScanner()->scanAll();
- \OCP\JSON::success();
+ try {
+ $storage->getScanner()->scanAll();
+ \OCP\JSON::success();
+ } catch (\OCP\Files\StorageInvalidException $e) {
+ \OCP\Util::writeLog(
+ 'files_sharing',
+ 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+ \OCP\Util::DEBUG
+ );
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Storage not valid'))));
+ } catch (\Exception $e) {
+ \OCP\Util::writeLog(
+ 'files_sharing',
+ 'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+ \OCP\Util::DEBUG
+ );
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t add remote share'))));
+ }
} else {
$externalManager->removeShare($mount->getMountPoint());
- \OCP\JSON::error(array('data' => array('message' => $l->t("Couldn't add remote share"))));
+ \OCP\Util::writeLog(
+ 'files_sharing',
+ 'Couldn\'t add remote share',
+ \OCP\Util::DEBUG
+ );
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t add remote share'))));
}
}
diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php
index 073c86365be..657c6f75da5 100644
--- a/apps/files_sharing/ajax/list.php
+++ b/apps/files_sharing/ajax/list.php
@@ -64,7 +64,10 @@ $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
$formattedFiles = array();
foreach ($files as $file) {
$entry = \OCA\Files\Helper::formatFileInfo($file);
- unset($entry['directory']); // for now
+ // for now
+ unset($entry['directory']);
+ // do not disclose share owner
+ unset($entry['shareOwner']);
$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
$formattedFiles[] = $entry;
}
diff --git a/apps/files_sharing/ajax/testremote.php b/apps/files_sharing/ajax/testremote.php
index 08149bf7ecc..14992787012 100644
--- a/apps/files_sharing/ajax/testremote.php
+++ b/apps/files_sharing/ajax/testremote.php
@@ -6,6 +6,7 @@
* See the COPYING-README file.
*/
+OCP\JSON::callCheck();
OCP\JSON::checkAppEnabled('files_sharing');
$remote = $_GET['remote'];
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index f78d64caa73..f2f7561598f 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -34,7 +34,7 @@ class Server2Server {
public function createShare($params) {
if (!$this->isS2SEnabled(true)) {
- return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+ return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
}
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
@@ -60,8 +60,9 @@ class Server2Server {
\OC::$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- \OC::$server->getUserSession(),
- \OC::$server->getHTTPHelper());
+ \OC::$server->getHTTPHelper(),
+ $shareWith
+ );
$name = \OCP\Files::buildNotExistingFileName('/', $name);
@@ -93,7 +94,7 @@ class Server2Server {
public function acceptShare($params) {
if (!$this->isS2SEnabled()) {
- return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+ return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
}
$id = $params['id'];
@@ -120,7 +121,7 @@ class Server2Server {
public function declineShare($params) {
if (!$this->isS2SEnabled()) {
- return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+ return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
}
$id = $params['id'];
@@ -151,7 +152,7 @@ class Server2Server {
public function unshare($params) {
if (!$this->isS2SEnabled()) {
- return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+ return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
}
$id = $params['id'];
diff --git a/apps/files_sharing/application.php b/apps/files_sharing/application.php
index 56ec448d6a9..3302848106f 100644
--- a/apps/files_sharing/application.php
+++ b/apps/files_sharing/application.php
@@ -69,12 +69,14 @@ class Application extends App {
return Helper::isIncomingServer2serverShareEnabled();
});
$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server){
+ $user = $server->getUserSession()->getUser();
+ $uid = $user ? $user->getUID() : null;
return new \OCA\Files_Sharing\External\Manager(
$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- $server->getUserSession(),
- $server->getHTTPHelper()
+ $server->getHTTPHelper(),
+ $uid
);
});
diff --git a/apps/files_sharing/js/external.js b/apps/files_sharing/js/external.js
index 31407f28ffd..f658de307ab 100644
--- a/apps/files_sharing/js/external.js
+++ b/apps/files_sharing/js/external.js
@@ -95,7 +95,7 @@
name: share.name,
password: password}, function(result) {
if (result.status === 'error') {
- OC.Notification.show(result.data.message);
+ OC.Notification.showTemporary(result.data.message);
} else {
fileList.reload();
}
@@ -131,8 +131,10 @@
function(result, share) {
if (result) {
// Accept
- $.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id});
- fileList.reload();
+ $.post(OC.generateUrl('/apps/files_sharing/api/externalShares'), {id: share.id})
+ .then(function() {
+ fileList.reload();
+ });
} else {
// Delete
$.ajax({
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 3a16c1f2edd..11c3170c2f0 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -25,7 +25,7 @@
* @param {OCA.Files.FileList} fileList file list to be extended
*/
attach: function(fileList) {
- if (fileList.id === 'trashbin') {
+ if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
return;
}
var fileActions = fileList.fileActions;
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index 4681d5ed710..7a637db3a40 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -4,21 +4,36 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.",
"The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
"Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+ "Could not authenticate to remote share, password might be wrong" : "Неуспешно автентициране към отсрещната страна, паролата може да е грешна",
+ "Storage not valid" : "Невалидно дисково пространство.",
"Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.",
"Shared with you" : "Споделено с теб",
"Shared with others" : "Споделено с други",
"Shared by link" : "Споделено с връзка",
+ "Nothing shared with you yet" : "Все още няма нищо споделено с теб",
+ "Files and folders others share with you will show up here" : "Файлове и папки, споделени от други с теб, ще се показват тук",
+ "Nothing shared yet" : "Още нищо не е споделено",
+ "Files and folders you share will show up here" : "Файлове и папки, които ти споделяшм ще се показват тук.",
+ "No shared links" : "Няма споделени връзки",
+ "Files and folders you share by link will show up here" : "Файлове и директории, които ти споделяш чрез връзки, ще се показват тук",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
"Remote share" : "Прикачена Папка",
"Remote share password" : "Парола за прикачена папка",
"Cancel" : "Отказ",
"Add remote share" : "Добави прикачена папка",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.",
"Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
"Share" : "Сподели",
"Shared by" : "Споделено от",
+ "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от <strong>друг сървър</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е <strong>изтеглен</strong>",
+ "%1$s unshared %2$s from you" : "%1$s спря споделянето на %2$s с теб",
+ "Public shared folder %1$s was downloaded" : "Публично споделената папка %1$s бе изтеглена",
+ "Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен",
"This share is password-protected" : "Тази зона е защитена с парола.",
"The password is wrong. Try again." : "Грешна парола. Опитай отново.",
"Password" : "Парола",
+ "No entries found in this folder" : "Няма намерени записи в тази директория",
"Name" : "Име",
"Share time" : "Споделено на",
"Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.",
@@ -31,7 +46,6 @@ OC.L10N.register(
"Download" : "Изтегли",
"Download %s" : "Изтегли %s",
"Direct link" : "Директна връзка",
- "Server-to-Server Sharing" : "Споделяне между Сървъри",
"Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри",
"Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри"
},
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index 99ccd828e4a..c4180087200 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -2,21 +2,36 @@
"Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.",
"The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
"Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+ "Could not authenticate to remote share, password might be wrong" : "Неуспешно автентициране към отсрещната страна, паролата може да е грешна",
+ "Storage not valid" : "Невалидно дисково пространство.",
"Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.",
"Shared with you" : "Споделено с теб",
"Shared with others" : "Споделено с други",
"Shared by link" : "Споделено с връзка",
+ "Nothing shared with you yet" : "Все още няма нищо споделено с теб",
+ "Files and folders others share with you will show up here" : "Файлове и папки, споделени от други с теб, ще се показват тук",
+ "Nothing shared yet" : "Още нищо не е споделено",
+ "Files and folders you share will show up here" : "Файлове и папки, които ти споделяшм ще се показват тук.",
+ "No shared links" : "Няма споделени връзки",
+ "Files and folders you share by link will show up here" : "Файлове и директории, които ти споделяш чрез връзки, ще се показват тук",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
"Remote share" : "Прикачена Папка",
"Remote share password" : "Парола за прикачена папка",
"Cancel" : "Отказ",
"Add remote share" : "Добави прикачена папка",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.",
"Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
"Share" : "Сподели",
"Shared by" : "Споделено от",
+ "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от <strong>друг сървър</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е <strong>изтеглен</strong>",
+ "%1$s unshared %2$s from you" : "%1$s спря споделянето на %2$s с теб",
+ "Public shared folder %1$s was downloaded" : "Публично споделената папка %1$s бе изтеглена",
+ "Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен",
"This share is password-protected" : "Тази зона е защитена с парола.",
"The password is wrong. Try again." : "Грешна парола. Опитай отново.",
"Password" : "Парола",
+ "No entries found in this folder" : "Няма намерени записи в тази директория",
"Name" : "Име",
"Share time" : "Споделено на",
"Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.",
@@ -29,7 +44,6 @@
"Download" : "Изтегли",
"Download %s" : "Изтегли %s",
"Direct link" : "Директна връзка",
- "Server-to-Server Sharing" : "Споделяне между Сървъри",
"Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри",
"Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index c401a265a67..14d9ffe4a1d 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Sdílení mezi servery není povoleno",
"The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje nepovolené znaky.",
"Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
+ "Could not authenticate to remote share, password might be wrong" : "Nezdařilo se ověření vzdáleného úložiště, pravděpodobně chybné heslo",
+ "Storage not valid" : "Úložiště není platné",
"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",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Stáhnout",
"Download %s" : "Stáhnout %s",
"Direct link" : "Přímý odkaz",
- "Server-to-Server Sharing" : "Sdílení mezi servery",
+ "Federated Cloud Sharing" : "Propojené cloudové sdílení",
"Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery",
"Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů"
},
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 2cefff1ebb7..d0679be3227 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Sdílení mezi servery není povoleno",
"The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje nepovolené znaky.",
"Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
+ "Could not authenticate to remote share, password might be wrong" : "Nezdařilo se ověření vzdáleného úložiště, pravděpodobně chybné heslo",
+ "Storage not valid" : "Úložiště není platné",
"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",
@@ -45,7 +47,7 @@
"Download" : "Stáhnout",
"Download %s" : "Stáhnout %s",
"Direct link" : "Přímý odkaz",
- "Server-to-Server Sharing" : "Sdílení mezi servery",
+ "Federated Cloud Sharing" : "Propojené cloudové sdílení",
"Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery",
"Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 34271d0de14..2c5fe6b82f5 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -4,7 +4,9 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server",
"The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.",
"Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat",
- "Couldn't add remote share" : "Kunne ikke tliføje den delte ekstern ressource",
+ "Could not authenticate to remote share, password might be wrong" : "Kunne ikke godkende fjerndelingen - kodeordet er muilgvis forkert",
+ "Storage not valid" : "Lagerplads er ikke gyldig",
+ "Couldn't add remote share" : "Kunne ikke tliføje den ekstern deling",
"Shared with you" : "Delt med dig",
"Shared with others" : "Delt med andre",
"Shared by link" : "Delt via link",
@@ -19,12 +21,12 @@ OC.L10N.register(
"Remote share password" : "Adgangskode for ekstern deling",
"Cancel" : "Annuller",
"Add remote share" : "Tilføj ekstern deling",
- "No ownCloud installation (7 or higher) found at {remote}" : "Der blev ikke nogen ownCloud-installation (7 eller højere) på {remote}",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}",
"Invalid ownCloud url" : "Ugyldig ownCloud-URL",
"Share" : "Del",
"Shared by" : "Delt af",
"A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe blev delt fra <strong>en anden server</strong>",
- "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>downloadet</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>hentet</strong>",
"You received a new remote share from %s" : "Du modtog en ny ekstern deling fra %s",
"%1$s accepted remote share %2$s" : "%1$s accepterede den ekstern deling %2$s",
"%1$s declined remote share %2$s" : "%1$s afviste den eksterne deling %2$s",
@@ -44,10 +46,10 @@ OC.L10N.register(
"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. ",
"Add to your ownCloud" : "Tilføj til din ownCload",
- "Download" : "Download",
- "Download %s" : "Download %s",
+ "Download" : "Hent",
+ "Download %s" : "Hent %s",
"Direct link" : "Direkte link",
- "Server-to-Server Sharing" : "Deling via server-til-server",
+ "Federated Cloud Sharing" : "Sammensluttet Cloud deling",
"Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
"Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere"
},
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 762a6ade989..51443a5d003 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -2,7 +2,9 @@
"Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server",
"The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.",
"Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat",
- "Couldn't add remote share" : "Kunne ikke tliføje den delte ekstern ressource",
+ "Could not authenticate to remote share, password might be wrong" : "Kunne ikke godkende fjerndelingen - kodeordet er muilgvis forkert",
+ "Storage not valid" : "Lagerplads er ikke gyldig",
+ "Couldn't add remote share" : "Kunne ikke tliføje den ekstern deling",
"Shared with you" : "Delt med dig",
"Shared with others" : "Delt med andre",
"Shared by link" : "Delt via link",
@@ -17,12 +19,12 @@
"Remote share password" : "Adgangskode for ekstern deling",
"Cancel" : "Annuller",
"Add remote share" : "Tilføj ekstern deling",
- "No ownCloud installation (7 or higher) found at {remote}" : "Der blev ikke nogen ownCloud-installation (7 eller højere) på {remote}",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}",
"Invalid ownCloud url" : "Ugyldig ownCloud-URL",
"Share" : "Del",
"Shared by" : "Delt af",
"A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe blev delt fra <strong>en anden server</strong>",
- "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>downloadet</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>hentet</strong>",
"You received a new remote share from %s" : "Du modtog en ny ekstern deling fra %s",
"%1$s accepted remote share %2$s" : "%1$s accepterede den ekstern deling %2$s",
"%1$s declined remote share %2$s" : "%1$s afviste den eksterne deling %2$s",
@@ -42,10 +44,10 @@
"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. ",
"Add to your ownCloud" : "Tilføj til din ownCload",
- "Download" : "Download",
- "Download %s" : "Download %s",
+ "Download" : "Hent",
+ "Download %s" : "Hent %s",
"Direct link" : "Direkte link",
- "Server-to-Server Sharing" : "Deling via server-til-server",
+ "Federated Cloud Sharing" : "Sammensluttet Cloud deling",
"Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
"Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 96510fbc3f5..d53e43e83a4 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -2,8 +2,10 @@ OC.L10N.register(
"files_sharing",
{
"Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
- "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
+ "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
"Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+ "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+ "Storage not valid" : "Speicher ungültig",
"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",
@@ -24,13 +26,13 @@ OC.L10N.register(
"Share" : "Share",
"Shared by" : "Geteilt von ",
"A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.",
"Password" : "Passwort",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Herunterladen",
"Download %s" : "Download %s",
"Direct link" : "Direkter Link",
- "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
+ "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
"Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
},
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 58ba73427d0..78ccece1bf1 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -1,7 +1,9 @@
{ "translations": {
"Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
- "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
+ "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
"Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+ "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+ "Storage not valid" : "Speicher ungültig",
"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",
@@ -22,13 +24,13 @@
"Share" : "Share",
"Shared by" : "Geteilt von ",
"A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.",
"Password" : "Passwort",
@@ -45,7 +47,7 @@
"Download" : "Herunterladen",
"Download %s" : "Download %s",
"Direct link" : "Direkter Link",
- "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
+ "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
"Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 197e41f49e7..d44e97e6056 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
"The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
"Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+ "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+ "Storage not valid" : "Speicher ungültig",
"Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
"Shared with you" : "Mit Ihnen geteilt",
"Shared with others" : "Von Ihnen geteilt",
@@ -23,14 +25,14 @@ OC.L10N.register(
"Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
"Share" : "Teilen",
"Shared by" : "Geteilt von",
- "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>",
+ "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" : "Passwort",
@@ -42,13 +44,13 @@ OC.L10N.register(
"the item was removed" : "Das Element wurde entfernt",
"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.",
+ "For more info, please ask the person who sent this link." : "Um weitere Informationen zu erhalten, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
"Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
"Download" : "Herunterladen",
"Download %s" : "Download %s",
"Direct link" : "Direkte Verlinkung",
- "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
- "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
- "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
+ "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+ "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+ "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index f812da438a1..8571d4fdd83 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
"The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
"Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+ "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+ "Storage not valid" : "Speicher ungültig",
"Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
"Shared with you" : "Mit Ihnen geteilt",
"Shared with others" : "Von Ihnen geteilt",
@@ -21,14 +23,14 @@
"Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
"Share" : "Teilen",
"Shared by" : "Geteilt von",
- "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder Ordner wurde von <strong>einem anderen Server</strong> geteilt",
- "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentlich geteilte Datei oder Ordner wurde <strong>heruntergeladen</strong>",
+ "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
"You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten",
"%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert",
"%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt",
"%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt",
- "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
- "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
+ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
"The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" : "Passwort",
@@ -40,13 +42,13 @@
"the item was removed" : "Das Element wurde entfernt",
"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.",
+ "For more info, please ask the person who sent this link." : "Um weitere Informationen zu erhalten, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
"Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
"Download" : "Herunterladen",
"Download %s" : "Download %s",
"Direct link" : "Direkte Verlinkung",
- "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
- "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
- "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
+ "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+ "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+ "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 5a22c305921..69619567ba9 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -4,23 +4,39 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
"The mountpoint name contains invalid characters." : "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
"Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
+ "Could not authenticate to remote share, password might be wrong" : "Δεν ήταν δυνατή η πιστοποίηση στο απομακρυσμένο διαμοιρασμένο στοιχείο, μπορεί να είναι λάθος ο κωδικός πρόσβασης",
+ "Storage not valid" : "Μη έγκυρος αποθηκευτικός χώρος",
"Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
"Shared with you" : "Διαμοιρασμένο με εσάς",
"Shared with others" : "Διαμοιρασμένο με άλλους",
"Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου",
+ "Nothing shared with you yet" : "Δεν έχει διαμοιραστεί κάτι με εσάς ακόμα",
+ "Files and folders others share with you will show up here" : "Τα αρχεία και οι φάκελοι που άλλοι διαμοιράζονται με εσάς θα εμφανιστούν εδώ",
"Nothing shared yet" : "Δεν έχει διαμοιραστεί τίποτα μέχρι στιγμής",
+ "Files and folders you share will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανιστούν εδώ",
"No shared links" : "Κανένας διαμοιρασμένος σύνδεσμος",
+ "Files and folders you share by link will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε μέσω συνδέσμου θα εμφανιστούνε εδώ",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
"Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος",
"Remote share password" : "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου",
"Cancel" : "Άκυρο",
"Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Δεν βρέθηκε εγκατάστση ownCloud (7 ή νεώτερη) στο {remote}",
"Invalid ownCloud url" : "Άκυρη url ownCloud ",
"Share" : "Διαμοιράστε",
"Shared by" : "Διαμοιράστηκε από",
+ "A file or folder was shared from <strong>another server</strong>" : "Ένα αρχείο ή φάκελος διαμοιράστηκε από <strong>έναν άλλο διακομιστή</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Ένα δημόσια διαμοιρασμένο αρχείο ή φάκελος <strong>ελήφθη</strong>",
+ "You received a new remote share from %s" : "Λάβατε ένα νέο απομακρυσμένο κοινόχρηστο φάκελο από %s",
+ "%1$s accepted remote share %2$s" : "Ο %1$s αποδέχθηκε τον απομακρυσμένο φάκελο %2$s",
+ "%1$s declined remote share %2$s" : "Ο %1$s αρνήθηκε τον απομακρυσμένο διαμοιρασμένο φάκελο %2$s",
+ "%1$s unshared %2$s from you" : "Ο %1$s απέσυρε το διαμοιρασμό του %2$s με εσάς",
+ "Public shared folder %1$s was downloaded" : "Ο κοινόχρηστος διαμοιρασμένος φάκελος %1$s ελήφθη",
+ "Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη",
"This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
"The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
"Password" : "Κωδικός πρόσβασης",
+ "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
"Name" : "Όνομα",
"Share time" : "Χρόνος διαμοιρασμού",
"Sorry, this link doesn’t seem to work anymore." : "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
@@ -33,7 +49,7 @@ OC.L10N.register(
"Download" : "Λήψη",
"Download %s" : "Λήψη %s",
"Direct link" : "Άμεσος σύνδεσμος",
- "Server-to-Server Sharing" : "Διαμοιρασμός διακομιστής προς διακομιστή",
+ "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
"Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 606cd3df636..3d124359f43 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -2,23 +2,39 @@
"Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
"The mountpoint name contains invalid characters." : "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
"Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
+ "Could not authenticate to remote share, password might be wrong" : "Δεν ήταν δυνατή η πιστοποίηση στο απομακρυσμένο διαμοιρασμένο στοιχείο, μπορεί να είναι λάθος ο κωδικός πρόσβασης",
+ "Storage not valid" : "Μη έγκυρος αποθηκευτικός χώρος",
"Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
"Shared with you" : "Διαμοιρασμένο με εσάς",
"Shared with others" : "Διαμοιρασμένο με άλλους",
"Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου",
+ "Nothing shared with you yet" : "Δεν έχει διαμοιραστεί κάτι με εσάς ακόμα",
+ "Files and folders others share with you will show up here" : "Τα αρχεία και οι φάκελοι που άλλοι διαμοιράζονται με εσάς θα εμφανιστούν εδώ",
"Nothing shared yet" : "Δεν έχει διαμοιραστεί τίποτα μέχρι στιγμής",
+ "Files and folders you share will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανιστούν εδώ",
"No shared links" : "Κανένας διαμοιρασμένος σύνδεσμος",
+ "Files and folders you share by link will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε μέσω συνδέσμου θα εμφανιστούνε εδώ",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
"Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος",
"Remote share password" : "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου",
"Cancel" : "Άκυρο",
"Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Δεν βρέθηκε εγκατάστση ownCloud (7 ή νεώτερη) στο {remote}",
"Invalid ownCloud url" : "Άκυρη url ownCloud ",
"Share" : "Διαμοιράστε",
"Shared by" : "Διαμοιράστηκε από",
+ "A file or folder was shared from <strong>another server</strong>" : "Ένα αρχείο ή φάκελος διαμοιράστηκε από <strong>έναν άλλο διακομιστή</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Ένα δημόσια διαμοιρασμένο αρχείο ή φάκελος <strong>ελήφθη</strong>",
+ "You received a new remote share from %s" : "Λάβατε ένα νέο απομακρυσμένο κοινόχρηστο φάκελο από %s",
+ "%1$s accepted remote share %2$s" : "Ο %1$s αποδέχθηκε τον απομακρυσμένο φάκελο %2$s",
+ "%1$s declined remote share %2$s" : "Ο %1$s αρνήθηκε τον απομακρυσμένο διαμοιρασμένο φάκελο %2$s",
+ "%1$s unshared %2$s from you" : "Ο %1$s απέσυρε το διαμοιρασμό του %2$s με εσάς",
+ "Public shared folder %1$s was downloaded" : "Ο κοινόχρηστος διαμοιρασμένος φάκελος %1$s ελήφθη",
+ "Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη",
"This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
"The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
"Password" : "Κωδικός πρόσβασης",
+ "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
"Name" : "Όνομα",
"Share time" : "Χρόνος διαμοιρασμού",
"Sorry, this link doesn’t seem to work anymore." : "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
@@ -31,7 +47,7 @@
"Download" : "Λήψη",
"Download %s" : "Λήψη %s",
"Direct link" : "Άμεσος σύνδεσμος",
- "Server-to-Server Sharing" : "Διαμοιρασμός διακομιστής προς διακομιστή",
+ "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
"Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index 8edab575ffa..f7372023a21 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
"The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
"Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
+ "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong",
+ "Storage not valid" : "Storage not valid",
"Couldn't add remote share" : "Couldn't add remote share",
"Shared with you" : "Shared with you",
"Shared with others" : "Shared with others",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Download",
"Download %s" : "Download %s",
"Direct link" : "Direct link",
- "Server-to-Server Sharing" : "Server-to-Server Sharing",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
"Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
"Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers"
},
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index cefbd0c52f7..0d89d67a73d 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
"The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
"Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
+ "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong",
+ "Storage not valid" : "Storage not valid",
"Couldn't add remote share" : "Couldn't add remote share",
"Shared with you" : "Shared with you",
"Shared with others" : "Shared with others",
@@ -45,7 +47,7 @@
"Download" : "Download",
"Download %s" : "Download %s",
"Direct link" : "Direct link",
- "Server-to-Server Sharing" : "Server-to-Server Sharing",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
"Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
"Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index af6159e0420..b107bc7f3e1 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor",
"The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
+ "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña",
+ "Storage not valid" : "Almacenamiento inválido",
"Couldn't add remote share" : "No se puede añadir un compartido remoto",
"Shared with you" : "Compartido contigo",
"Shared with others" : "Compartido con otros",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Descargar",
"Download %s" : "Descargar %s",
"Direct link" : "Enlace directo",
- "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor",
+ "Federated Cloud Sharing" : "Compartido en Cloud Federado",
"Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores"
},
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index e8f9c2f5517..02f7e2ab24a 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor",
"The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
+ "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña",
+ "Storage not valid" : "Almacenamiento inválido",
"Couldn't add remote share" : "No se puede añadir un compartido remoto",
"Shared with you" : "Compartido contigo",
"Shared with others" : "Compartido con otros",
@@ -45,7 +47,7 @@
"Download" : "Descargar",
"Download %s" : "Descargar %s",
"Direct link" : "Enlace directo",
- "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor",
+ "Federated Cloud Sharing" : "Compartido en Cloud Federado",
"Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index af461bdb185..f1ebfe40c9a 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -31,7 +31,6 @@ OC.L10N.register(
"Download" : "Lae alla",
"Download %s" : "Laadi alla %s",
"Direct link" : "Otsene link",
- "Server-to-Server Sharing" : "Serverist-serverisse jagamine",
"Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
"Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest"
},
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index 4cccbccd478..fe49003fc5d 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -29,7 +29,6 @@
"Download" : "Lae alla",
"Download %s" : "Laadi alla %s",
"Direct link" : "Otsene link",
- "Server-to-Server Sharing" : "Serverist-serverisse jagamine",
"Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
"Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
index e136a736521..047a96a73f1 100644
--- a/apps/files_sharing/l10n/eu.js
+++ b/apps/files_sharing/l10n/eu.js
@@ -4,21 +4,34 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
"The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
"Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza",
+ "Storage not valid" : "Biltegi bliogabea",
"Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
"Shared with you" : "Zurekin elkarbanatuta",
"Shared with others" : "Beste batzuekin elkarbanatuta",
"Shared by link" : "Lotura bidez elkarbanatuta",
+ "Nothing shared with you yet" : "Oraindik ez da ezer partekatu zurekin",
+ "Files and folders others share with you will show up here" : "Zurekin partekatutako fitxategi eta karpetak hemen agertuko dira",
+ "Nothing shared yet" : "Oraindik ez da ezer partekatu",
+ "Files and folders you share will show up here" : "Partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
+ "No shared links" : "Ez dago partekatutako loturarik",
+ "Files and folders you share by link will show up here" : "Lotura bidez partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea {name} urrutiko partekatzea honengandik {owner}@{remote}?",
"Remote share" : "Urrutiko parte hartzea",
"Remote share password" : "Urrutiko parte hartzeen pasahitza",
"Cancel" : "Ezeztatu",
"Add remote share" : "Gehitu urrutiko parte hartzea",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n",
"Invalid ownCloud url" : "ownCloud url baliogabea",
"Share" : "Partekatu",
"Shared by" : "Honek elkarbanatuta",
+ "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>",
+ "Public shared folder %1$s was downloaded" : "Publikoki partekatutako %1$s karpeta deskargatu da",
+ "Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da",
"This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
"The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
"Password" : "Pasahitza",
+ "No entries found in this folder" : "Karpeta honetan ez da sarreraik aurkitu",
"Name" : "Izena",
"Share time" : "Elkarbanatze unea",
"Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
@@ -30,6 +43,9 @@ OC.L10N.register(
"Add to your ownCloud" : "Gehitu zure ownCloud-era",
"Download" : "Deskargatu",
"Download %s" : "Deskargatu %s",
- "Direct link" : "Lotura zuzena"
+ "Direct link" : "Lotura zuzena",
+ "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea",
+ "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera",
+ "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
index 7355146ee9c..58e5225abf9 100644
--- a/apps/files_sharing/l10n/eu.json
+++ b/apps/files_sharing/l10n/eu.json
@@ -2,21 +2,34 @@
"Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
"The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
"Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza",
+ "Storage not valid" : "Biltegi bliogabea",
"Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
"Shared with you" : "Zurekin elkarbanatuta",
"Shared with others" : "Beste batzuekin elkarbanatuta",
"Shared by link" : "Lotura bidez elkarbanatuta",
+ "Nothing shared with you yet" : "Oraindik ez da ezer partekatu zurekin",
+ "Files and folders others share with you will show up here" : "Zurekin partekatutako fitxategi eta karpetak hemen agertuko dira",
+ "Nothing shared yet" : "Oraindik ez da ezer partekatu",
+ "Files and folders you share will show up here" : "Partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
+ "No shared links" : "Ez dago partekatutako loturarik",
+ "Files and folders you share by link will show up here" : "Lotura bidez partekatzen dituzun fitxategi eta karpetak hemen agertuko dira",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea {name} urrutiko partekatzea honengandik {owner}@{remote}?",
"Remote share" : "Urrutiko parte hartzea",
"Remote share password" : "Urrutiko parte hartzeen pasahitza",
"Cancel" : "Ezeztatu",
"Add remote share" : "Gehitu urrutiko parte hartzea",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n",
"Invalid ownCloud url" : "ownCloud url baliogabea",
"Share" : "Partekatu",
"Shared by" : "Honek elkarbanatuta",
+ "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>",
+ "Public shared folder %1$s was downloaded" : "Publikoki partekatutako %1$s karpeta deskargatu da",
+ "Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da",
"This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
"The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
"Password" : "Pasahitza",
+ "No entries found in this folder" : "Karpeta honetan ez da sarreraik aurkitu",
"Name" : "Izena",
"Share time" : "Elkarbanatze unea",
"Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
@@ -28,6 +41,9 @@
"Add to your ownCloud" : "Gehitu zure ownCloud-era",
"Download" : "Deskargatu",
"Download %s" : "Deskargatu %s",
- "Direct link" : "Lotura zuzena"
+ "Direct link" : "Lotura zuzena",
+ "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea",
+ "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera",
+ "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 5b42bd73062..f8803a05dca 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella",
"The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.",
"Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne",
+ "Could not authenticate to remote share, password might be wrong" : "Tunnistautuminen etäjakoa kohtaan epäonnistui. Salasana saattaa olla väärä",
+ "Storage not valid" : "Tallennustila ei ole kelvollinen",
"Couldn't add remote share" : "Etäjaon liittäminen epäonnistui",
"Shared with you" : "Jaettu kanssasi",
"Shared with others" : "Jaettu muiden kanssa",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Lataa",
"Download %s" : "Lataa %s",
"Direct link" : "Suora linkki",
- "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen",
+ "Federated Cloud Sharing" : "Federoitu pilvijakaminen",
"Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille",
"Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta"
},
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 32c14309fb3..29f7d5ba14d 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella",
"The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.",
"Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne",
+ "Could not authenticate to remote share, password might be wrong" : "Tunnistautuminen etäjakoa kohtaan epäonnistui. Salasana saattaa olla väärä",
+ "Storage not valid" : "Tallennustila ei ole kelvollinen",
"Couldn't add remote share" : "Etäjaon liittäminen epäonnistui",
"Shared with you" : "Jaettu kanssasi",
"Shared with others" : "Jaettu muiden kanssa",
@@ -45,7 +47,7 @@
"Download" : "Lataa",
"Download %s" : "Lataa %s",
"Direct link" : "Suora linkki",
- "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen",
+ "Federated Cloud Sharing" : "Federoitu pilvijakaminen",
"Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille",
"Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 418ef7764c1..96ccb0b2c8c 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur",
"The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.",
"Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable",
+ "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect",
+ "Storage not valid" : "Support de stockage non valide",
"Couldn't add remote share" : "Impossible d'ajouter le partage distant",
"Shared with you" : "Partagés avec vous",
"Shared with others" : "Partagés avec d'autres",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Télécharger",
"Download %s" : "Télécharger %s",
"Direct link" : "Lien direct",
- "Server-to-Server Sharing" : "Partage de serveur à serveur",
+ "Federated Cloud Sharing" : "Partage fédéré dans le cloud",
"Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
"Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
},
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 73b5b199213..c148f654f63 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur",
"The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.",
"Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable",
+ "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect",
+ "Storage not valid" : "Support de stockage non valide",
"Couldn't add remote share" : "Impossible d'ajouter le partage distant",
"Shared with you" : "Partagés avec vous",
"Shared with others" : "Partagés avec d'autres",
@@ -45,7 +47,7 @@
"Download" : "Télécharger",
"Download %s" : "Télécharger %s",
"Direct link" : "Lien direct",
- "Server-to-Server Sharing" : "Partage de serveur à serveur",
+ "Federated Cloud Sharing" : "Partage fédéré dans le cloud",
"Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
"Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index a04775b368a..36967ee11dd 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor",
"The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel",
+ "Could not authenticate to remote share, password might be wrong" : "Non se puido autenticar na compartición remota, o contrasinal podería ser erróneo",
+ "Storage not valid" : "Almacenamento non válido",
"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",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Descargar",
"Download %s" : "Descargar %s",
"Direct link" : "Ligazón directa",
- "Server-to-Server Sharing" : "Compartición Servidor-a-Servidor",
+ "Federated Cloud Sharing" : "Compartición de nube federada",
"Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores"
},
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index f08296ee74d..81d97bfdcec 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor",
"The mountpoint name contains invalid characters." : "O nome do punto de montaxe contén caracteres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel",
+ "Could not authenticate to remote share, password might be wrong" : "Non se puido autenticar na compartición remota, o contrasinal podería ser erróneo",
+ "Storage not valid" : "Almacenamento non válido",
"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",
@@ -45,7 +47,7 @@
"Download" : "Descargar",
"Download %s" : "Descargar %s",
"Direct link" : "Ligazón directa",
- "Server-to-Server Sharing" : "Compartición Servidor-a-Servidor",
+ "Federated Cloud Sharing" : "Compartición de nube federada",
"Allow users on this server to send shares to other servers" : "Permitir aos ususarios de este servidor enviar comparticións a outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir aos usuarios de este servidor recibir comparticións de outros servidores"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 6cb9f17628e..74c0af2695b 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -2,25 +2,43 @@ OC.L10N.register(
"files_sharing",
{
"Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
- "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.",
+ "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
"Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya",
+ "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
+ "Storage not valid" : "Penyimpanan tidak sah",
"Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
"Shared with you" : "Dibagikan dengan Anda",
"Shared with others" : "Dibagikan dengan lainnya",
"Shared by link" : "Dibagikan dengan tautan",
+ "Nothing shared with you yet" : "Tidak ada yang dibagikan kepada Anda",
+ "Files and folders others share with you will show up here" : "Berkas dan folder lainnya yang dibagikan kepada Anda akan ditampilkan disini",
+ "Nothing shared yet" : "Tidak ada yang dibagikan",
+ "Files and folders you share will show up here" : "Berkas dan folder yang Anda bagikan akan ditampilkan disini",
+ "No shared links" : "Tidak ada tautan berbagi",
+ "Files and folders you share by link will show up here" : "Berkas dan folder yang Anda bagikan menggunakan tautan akan ditampilkan disini",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
"Remote share" : "Berbagi remote",
"Remote share password" : "Sandi berbagi remote",
"Cancel" : "Batal",
"Add remote share" : "Tambah berbagi remote",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
"Invalid ownCloud url" : "URL ownCloud tidak sah",
"Share" : "Bagikan",
"Shared by" : "Dibagikan oleh",
+ "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>",
+ "You received a new remote share from %s" : "Anda menerima berbagi remote baru dari %s",
+ "%1$s accepted remote share %2$s" : "%1$s menerima berbagi remote %2$s",
+ "%1$s declined remote share %2$s" : "%1$s menolak berbagi remote %2$s",
+ "%1$s unshared %2$s from you" : "%1$s menghapus berbagi %2$s dari Anda",
+ "Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh",
+ "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
"This share is password-protected" : "Berbagi ini dilindungi sandi",
"The password is wrong. Try again." : "Sandi salah. Coba lagi",
"Password" : "Sandi",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
"Name" : "Nama",
- "Share time" : "Bagikan waktu",
+ "Share time" : "Waktu berbagi",
"Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
"Reasons might be:" : "Alasan yang mungkin:",
"the item was removed" : "item telah dihapus",
@@ -30,6 +48,9 @@ OC.L10N.register(
"Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
"Download" : "Unduh",
"Download %s" : "Unduh %s",
- "Direct link" : "Tautan langsung"
+ "Direct link" : "Tautan langsung",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
+ "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
+ "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya."
},
"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index fee58639322..0c53df206a0 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -1,24 +1,42 @@
{ "translations": {
"Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
- "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.",
+ "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
"Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya",
+ "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
+ "Storage not valid" : "Penyimpanan tidak sah",
"Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
"Shared with you" : "Dibagikan dengan Anda",
"Shared with others" : "Dibagikan dengan lainnya",
"Shared by link" : "Dibagikan dengan tautan",
+ "Nothing shared with you yet" : "Tidak ada yang dibagikan kepada Anda",
+ "Files and folders others share with you will show up here" : "Berkas dan folder lainnya yang dibagikan kepada Anda akan ditampilkan disini",
+ "Nothing shared yet" : "Tidak ada yang dibagikan",
+ "Files and folders you share will show up here" : "Berkas dan folder yang Anda bagikan akan ditampilkan disini",
+ "No shared links" : "Tidak ada tautan berbagi",
+ "Files and folders you share by link will show up here" : "Berkas dan folder yang Anda bagikan menggunakan tautan akan ditampilkan disini",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
"Remote share" : "Berbagi remote",
"Remote share password" : "Sandi berbagi remote",
"Cancel" : "Batal",
"Add remote share" : "Tambah berbagi remote",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
"Invalid ownCloud url" : "URL ownCloud tidak sah",
"Share" : "Bagikan",
"Shared by" : "Dibagikan oleh",
+ "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>",
+ "You received a new remote share from %s" : "Anda menerima berbagi remote baru dari %s",
+ "%1$s accepted remote share %2$s" : "%1$s menerima berbagi remote %2$s",
+ "%1$s declined remote share %2$s" : "%1$s menolak berbagi remote %2$s",
+ "%1$s unshared %2$s from you" : "%1$s menghapus berbagi %2$s dari Anda",
+ "Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh",
+ "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
"This share is password-protected" : "Berbagi ini dilindungi sandi",
"The password is wrong. Try again." : "Sandi salah. Coba lagi",
"Password" : "Sandi",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
"Name" : "Nama",
- "Share time" : "Bagikan waktu",
+ "Share time" : "Waktu berbagi",
"Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
"Reasons might be:" : "Alasan yang mungkin:",
"the item was removed" : "item telah dihapus",
@@ -28,6 +46,9 @@
"Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
"Download" : "Unduh",
"Download %s" : "Unduh %s",
- "Direct link" : "Tautan langsung"
+ "Direct link" : "Tautan langsung",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
+ "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
+ "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya."
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index a5f2a0fe7f9..e8c87b65d32 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
"The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.",
"Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile",
+ "Could not authenticate to remote share, password might be wrong" : "Impossibile autenticarsi sulla condivisione remota, la password potrebbe essere errata",
+ "Storage not valid" : "Archiviazione non valida",
"Couldn't add remote share" : "Impossibile aggiungere la condivisione remota",
"Shared with you" : "Condivisi con te",
"Shared with others" : "Condivisi con altri",
@@ -28,7 +30,7 @@ OC.L10N.register(
"You received a new remote share from %s" : "Hai ricevuto una nuova condivisione remota da %s",
"%1$s accepted remote share %2$s" : "%1$s ha accettato la condivisione remota %2$s",
"%1$s declined remote share %2$s" : "%1$s ha rifiutato la condivisione remota %2$s",
- "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s da te",
+ "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te",
"Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"This share is password-protected" : "Questa condivione è protetta da password",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Scarica",
"Download %s" : "Scarica %s",
"Direct link" : "Collegamento diretto",
- "Server-to-Server Sharing" : "Condivisione server-a-server",
+ "Federated Cloud Sharing" : "Condivisione cloud federata",
"Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server",
"Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server"
},
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 0b1702bc368..46f9f24030b 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
"The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.",
"Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile",
+ "Could not authenticate to remote share, password might be wrong" : "Impossibile autenticarsi sulla condivisione remota, la password potrebbe essere errata",
+ "Storage not valid" : "Archiviazione non valida",
"Couldn't add remote share" : "Impossibile aggiungere la condivisione remota",
"Shared with you" : "Condivisi con te",
"Shared with others" : "Condivisi con altri",
@@ -26,7 +28,7 @@
"You received a new remote share from %s" : "Hai ricevuto una nuova condivisione remota da %s",
"%1$s accepted remote share %2$s" : "%1$s ha accettato la condivisione remota %2$s",
"%1$s declined remote share %2$s" : "%1$s ha rifiutato la condivisione remota %2$s",
- "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s da te",
+ "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te",
"Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"This share is password-protected" : "Questa condivione è protetta da password",
@@ -45,7 +47,7 @@
"Download" : "Scarica",
"Download %s" : "Scarica %s",
"Direct link" : "Collegamento diretto",
- "Server-to-Server Sharing" : "Condivisione server-a-server",
+ "Federated Cloud Sharing" : "Condivisione cloud federata",
"Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server",
"Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 664bb2b14ef..e82bfd6c612 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -4,6 +4,7 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません",
"The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。",
"Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書",
+ "Storage not valid" : "ストレージが無効です",
"Couldn't add remote share" : "リモート共有を追加できませんでした",
"Shared with you" : "他ユーザーがあなたと共有中",
"Shared with others" : "他ユーザーと共有中",
@@ -24,6 +25,7 @@ OC.L10N.register(
"Share" : "共有",
"Shared by" : "共有者:",
"A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーは <strong>他のサーバー</strong>から共有されました",
+ "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーは<strong>ダウンロード済み</strong>です",
"You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。",
"Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
@@ -33,7 +35,7 @@ OC.L10N.register(
"No entries found in this folder" : "このフォルダーにはエントリーがありません",
"Name" : "名前",
"Share time" : "共有時間",
- "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。",
+ "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。",
"Reasons might be:" : "理由は以下の通りと考えられます:",
"the item was removed" : "アイテムが削除されました",
"the link expired" : "リンクの期限が切れています",
@@ -43,7 +45,6 @@ OC.L10N.register(
"Download" : "ダウンロード",
"Download %s" : "%s をダウンロード",
"Direct link" : "リンク",
- "Server-to-Server Sharing" : "サーバー間共有",
"Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
"Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
},
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 4b3d24784ca..375ab797b58 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -2,6 +2,7 @@
"Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません",
"The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。",
"Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書",
+ "Storage not valid" : "ストレージが無効です",
"Couldn't add remote share" : "リモート共有を追加できませんでした",
"Shared with you" : "他ユーザーがあなたと共有中",
"Shared with others" : "他ユーザーと共有中",
@@ -22,6 +23,7 @@
"Share" : "共有",
"Shared by" : "共有者:",
"A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーは <strong>他のサーバー</strong>から共有されました",
+ "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーは<strong>ダウンロード済み</strong>です",
"You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。",
"Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
@@ -31,7 +33,7 @@
"No entries found in this folder" : "このフォルダーにはエントリーがありません",
"Name" : "名前",
"Share time" : "共有時間",
- "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。",
+ "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。",
"Reasons might be:" : "理由は以下の通りと考えられます:",
"the item was removed" : "アイテムが削除されました",
"the link expired" : "リンクの期限が切れています",
@@ -41,7 +43,6 @@
"Download" : "ダウンロード",
"Download %s" : "%s をダウンロード",
"Direct link" : "リンク",
- "Server-to-Server Sharing" : "サーバー間共有",
"Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
"Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
},"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index f3fc02efa07..cc5489232c4 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음",
"The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.",
"Invalid or untrusted SSL certificate" : "잘못되었거나 신뢰할 수 없는 SSL 인증서",
+ "Could not authenticate to remote share, password might be wrong" : "원격 공유에서 인증할 수 없습니다. 암호가 맞지 않을 수 있습니다.",
+ "Storage not valid" : "저장소가 잘못됨",
"Couldn't add remote share" : "원격 공유를 추가할 수 없음",
"Shared with you" : "나와 공유됨",
"Shared with others" : "다른 사람과 공유됨",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "다운로드",
"Download %s" : "%s 다운로드",
"Direct link" : "직접 링크",
- "Server-to-Server Sharing" : "서버간 공유",
+ "Federated Cloud Sharing" : "클라우드 연합 공유",
"Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용",
"Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용"
},
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index 6c9423e02c8..b97d68d147d 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음",
"The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.",
"Invalid or untrusted SSL certificate" : "잘못되었거나 신뢰할 수 없는 SSL 인증서",
+ "Could not authenticate to remote share, password might be wrong" : "원격 공유에서 인증할 수 없습니다. 암호가 맞지 않을 수 있습니다.",
+ "Storage not valid" : "저장소가 잘못됨",
"Couldn't add remote share" : "원격 공유를 추가할 수 없음",
"Shared with you" : "나와 공유됨",
"Shared with others" : "다른 사람과 공유됨",
@@ -45,7 +47,7 @@
"Download" : "다운로드",
"Download %s" : "%s 다운로드",
"Direct link" : "직접 링크",
- "Server-to-Server Sharing" : "서버간 공유",
+ "Federated Cloud Sharing" : "클라우드 연합 공유",
"Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용",
"Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용"
},"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index f2521eca4a6..a1b5db31252 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Download" : "Last ned",
"Download %s" : "Last ned %s",
"Direct link" : "Direkte lenke",
- "Server-to-Server Sharing" : "Server-til-server-deling",
"Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere",
"Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere"
},
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index f42ab658332..30db000aa00 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -45,7 +45,6 @@
"Download" : "Last ned",
"Download %s" : "Last ned %s",
"Direct link" : "Direkte lenke",
- "Server-to-Server Sharing" : "Server-til-server-deling",
"Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere",
"Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 0ca0b3e9fc3..36619f9d399 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Server met server delen is niet geactiveerd op deze server",
"The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.",
"Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat",
+ "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord",
+ "Storage not valid" : "Opslag ongeldig",
"Couldn't add remote share" : "Kon geen externe share toevoegen",
"Shared with you" : "Gedeeld met u",
"Shared with others" : "Gedeeld door u",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Downloaden",
"Download %s" : "Download %s",
"Direct link" : "Directe link",
- "Server-to-Server Sharing" : "Server-naar-Server delen",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
"Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
"Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers"
},
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index d1fec7c4d90..01371413f41 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Server met server delen is niet geactiveerd op deze server",
"The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.",
"Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat",
+ "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord",
+ "Storage not valid" : "Opslag ongeldig",
"Couldn't add remote share" : "Kon geen externe share toevoegen",
"Shared with you" : "Gedeeld met u",
"Shared with others" : "Gedeeld door u",
@@ -45,7 +47,7 @@
"Download" : "Downloaden",
"Download %s" : "Download %s",
"Direct link" : "Directe link",
- "Server-to-Server Sharing" : "Server-naar-Server delen",
+ "Federated Cloud Sharing" : "Federated Cloud Sharing",
"Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
"Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 031720194ad..3f9e97f95a2 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Compartilhamento de servidor para servidor não está habilitado no servidor",
"The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticação com o compartilhamento remoto, a senha deve estar errada",
+ "Storage not valid" : "Armazenamento não válido",
"Couldn't add remote share" : "Não foi possível adicionar compartilhamento remoto",
"Shared with you" : "Compartilhado com você",
"Shared with others" : "Compartilhado com outros",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Baixar",
"Download %s" : "Baixar %s",
"Direct link" : "Link direto",
- "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor",
+ "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada",
"Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores"
},
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 457b72c4389..4665ba63f8b 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Compartilhamento de servidor para servidor não está habilitado no servidor",
"The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticação com o compartilhamento remoto, a senha deve estar errada",
+ "Storage not valid" : "Armazenamento não válido",
"Couldn't add remote share" : "Não foi possível adicionar compartilhamento remoto",
"Shared with you" : "Compartilhado com você",
"Shared with others" : "Compartilhado com outros",
@@ -45,7 +47,7 @@
"Download" : "Baixar",
"Download %s" : "Baixar %s",
"Direct link" : "Link direto",
- "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor",
+ "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada",
"Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 813a409aa9d..614f9b101e0 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
"The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+ "Storage not valid" : "Armazenamento inválido",
"Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
"Shared with you" : "Partilhado consigo ",
"Shared with others" : "Partilhado com outros",
@@ -11,15 +13,26 @@ OC.L10N.register(
"Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
"Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
"Nothing shared yet" : "Ainda não foi nada paratilhado",
+ "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
"No shared links" : "Sem hiperligações partilhadas",
+ "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
"Remote share" : "Partilha remota",
"Remote share password" : "Senha da partilha remota",
"Cancel" : "Cancelar",
"Add remote share" : "Adicionar partilha remota",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
"Invalid ownCloud url" : "Url ownCloud inválido",
"Share" : "Compartilhar",
"Shared by" : "Partilhado por",
+ "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>",
+ "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+ "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
+ "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
+ "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
+ "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
+ "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
"This share is password-protected" : "Esta partilha está protegida por senha",
"The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
"Password" : "Senha",
@@ -36,7 +49,7 @@ OC.L10N.register(
"Download" : "Transferir",
"Download %s" : "Transferir %s",
"Direct link" : "Hiperligação direta",
- "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha",
+ "Federated Cloud Sharing" : "Partilha de Cloud Federada",
"Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores"
},
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index f21c779e21d..24d0ebafb39 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
"The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
"Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+ "Storage not valid" : "Armazenamento inválido",
"Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
"Shared with you" : "Partilhado consigo ",
"Shared with others" : "Partilhado com outros",
@@ -9,15 +11,26 @@
"Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
"Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
"Nothing shared yet" : "Ainda não foi nada paratilhado",
+ "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
"No shared links" : "Sem hiperligações partilhadas",
+ "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
"Remote share" : "Partilha remota",
"Remote share password" : "Senha da partilha remota",
"Cancel" : "Cancelar",
"Add remote share" : "Adicionar partilha remota",
+ "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
"Invalid ownCloud url" : "Url ownCloud inválido",
"Share" : "Compartilhar",
"Shared by" : "Partilhado por",
+ "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
+ "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>",
+ "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+ "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
+ "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
+ "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
+ "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
+ "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
"This share is password-protected" : "Esta partilha está protegida por senha",
"The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
"Password" : "Senha",
@@ -34,7 +47,7 @@
"Download" : "Transferir",
"Download %s" : "Transferir %s",
"Direct link" : "Hiperligação direta",
- "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha",
+ "Federated Cloud Sharing" : "Partilha de Cloud Federada",
"Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
"Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index 588dc05f611..31e24f5991c 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
"The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
"Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
+ "Could not authenticate to remote share, password might be wrong" : "Не удалось произвести аутентификацию для доступа к удалённому хранилищу, возможно неправильно указан пароль",
+ "Storage not valid" : "Хранилище недоступно",
"Couldn't add remote share" : "Невозможно добавить удалённый общий ресурс",
"Shared with you" : "Поделились с вами",
"Shared with others" : "Доступные для других",
@@ -34,7 +36,7 @@ OC.L10N.register(
"This share is password-protected" : "Общий ресурс защищен паролем",
"The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.",
"Password" : "Пароль",
- "No entries found in this folder" : "Каталог пуст",
+ "No entries found in this folder" : "Нет элементов в этом каталоге",
"Name" : "Имя",
"Share time" : "Дата публикации",
"Sorry, this link doesn’t seem to work anymore." : "Эта ссылка устарела и более не действительна.",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Скачать",
"Download %s" : "Скачать %s",
"Direct link" : "Прямая ссылка",
- "Server-to-Server Sharing" : "Межсерверное предоставление доступа",
+ "Federated Cloud Sharing" : "Объединение облачных хранилищ",
"Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
"Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов"
},
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index 1a2fcbb9d95..8ff5e88c458 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
"The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
"Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
+ "Could not authenticate to remote share, password might be wrong" : "Не удалось произвести аутентификацию для доступа к удалённому хранилищу, возможно неправильно указан пароль",
+ "Storage not valid" : "Хранилище недоступно",
"Couldn't add remote share" : "Невозможно добавить удалённый общий ресурс",
"Shared with you" : "Поделились с вами",
"Shared with others" : "Доступные для других",
@@ -32,7 +34,7 @@
"This share is password-protected" : "Общий ресурс защищен паролем",
"The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.",
"Password" : "Пароль",
- "No entries found in this folder" : "Каталог пуст",
+ "No entries found in this folder" : "Нет элементов в этом каталоге",
"Name" : "Имя",
"Share time" : "Дата публикации",
"Sorry, this link doesn’t seem to work anymore." : "Эта ссылка устарела и более не действительна.",
@@ -45,7 +47,7 @@
"Download" : "Скачать",
"Download %s" : "Скачать %s",
"Direct link" : "Прямая ссылка",
- "Server-to-Server Sharing" : "Межсерверное предоставление доступа",
+ "Federated Cloud Sharing" : "Объединение облачных хранилищ",
"Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
"Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов"
},"pluralForm" :"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/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index d7df97d53ea..b34a84bc6e1 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -4,9 +4,11 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Zdieľanie server-server nie je na tomto serveri povolené",
"The mountpoint name contains invalid characters." : "Názov pripojovacieho bodu obsahuje nepovolené znaky.",
"Invalid or untrusted SSL certificate" : "Neplatný alebo nedôveryhodný certifikát SSL",
+ "Could not authenticate to remote share, password might be wrong" : "Nie je možné overiť vo vzdialenom úložisku, heslo môže byť nesprávne",
+ "Storage not valid" : "Neplatné úložisko",
"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 with others" : "Zdieľané s ostatnými",
"Shared by link" : "Zdieľané pomocou odkazu",
"Nothing shared with you yet" : "Zatiaľ s vami nikto nič nezdieľal.",
"Files and folders others share with you will show up here" : "Tu budú zobrazené súbory a priečinky, ktoré s vami zdieľajú ostatní",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "Sťahovanie",
"Download %s" : "Stiahnuť %s",
"Direct link" : "Priama linka",
- "Server-to-Server Sharing" : "Zdieľanie medzi servermi",
+ "Federated Cloud Sharing" : "Združené cloudové zdieľanie",
"Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery",
"Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov"
},
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index b88d2cfca15..8044b6112ef 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -2,9 +2,11 @@
"Server to server sharing is not enabled on this server" : "Zdieľanie server-server nie je na tomto serveri povolené",
"The mountpoint name contains invalid characters." : "Názov pripojovacieho bodu obsahuje nepovolené znaky.",
"Invalid or untrusted SSL certificate" : "Neplatný alebo nedôveryhodný certifikát SSL",
+ "Could not authenticate to remote share, password might be wrong" : "Nie je možné overiť vo vzdialenom úložisku, heslo môže byť nesprávne",
+ "Storage not valid" : "Neplatné úložisko",
"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 with others" : "Zdieľané s ostatnými",
"Shared by link" : "Zdieľané pomocou odkazu",
"Nothing shared with you yet" : "Zatiaľ s vami nikto nič nezdieľal.",
"Files and folders others share with you will show up here" : "Tu budú zobrazené súbory a priečinky, ktoré s vami zdieľajú ostatní",
@@ -45,7 +47,7 @@
"Download" : "Sťahovanie",
"Download %s" : "Stiahnuť %s",
"Direct link" : "Priama linka",
- "Server-to-Server Sharing" : "Zdieľanie medzi servermi",
+ "Federated Cloud Sharing" : "Združené cloudové zdieľanie",
"Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery",
"Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
index b770800e187..dc31132d9da 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Download" : "Prejmi",
"Download %s" : "Prejmi %s",
"Direct link" : "Neposredna povezava",
- "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik",
"Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.",
"Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov."
},
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index 38761d82764..eaf78fe1cfe 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -45,7 +45,6 @@
"Download" : "Prejmi",
"Download %s" : "Prejmi %s",
"Direct link" : "Neposredna povezava",
- "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik",
"Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.",
"Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov."
},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
diff --git a/apps/files_sharing/l10n/sr@latin.js b/apps/files_sharing/l10n/sr@latin.js
index 8bdfeb19baf..4f8fdf8aa0e 100644
--- a/apps/files_sharing/l10n/sr@latin.js
+++ b/apps/files_sharing/l10n/sr@latin.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Download" : "Preuzmi",
"Download %s" : "Preuzmi %s",
"Direct link" : "Direktna prečica",
- "Server-to-Server Sharing" : "Deljenje od servera do servera",
"Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere",
"Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera"
},
diff --git a/apps/files_sharing/l10n/sr@latin.json b/apps/files_sharing/l10n/sr@latin.json
index 8d8d6b2b552..9ff5074d21b 100644
--- a/apps/files_sharing/l10n/sr@latin.json
+++ b/apps/files_sharing/l10n/sr@latin.json
@@ -45,7 +45,6 @@
"Download" : "Preuzmi",
"Download %s" : "Preuzmi %s",
"Direct link" : "Direktna prečica",
- "Server-to-Server Sharing" : "Deljenje od servera do servera",
"Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere",
"Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera"
},"pluralForm" :"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.js b/apps/files_sharing/l10n/sv.js
index 05487983985..66012b8c3eb 100644
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@@ -45,7 +45,6 @@ OC.L10N.register(
"Download" : "Ladda ner",
"Download %s" : "Ladda ner %s",
"Direct link" : "Direkt länk",
- "Server-to-Server Sharing" : "Server-till-Server delning",
"Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar",
"Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar"
},
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
index 8a82105f1b3..4e9735737c0 100644
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@@ -43,7 +43,6 @@
"Download" : "Ladda ner",
"Download %s" : "Ladda ner %s",
"Direct link" : "Direkt länk",
- "Server-to-Server Sharing" : "Server-till-Server delning",
"Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar",
"Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 2e7cb753dea..e924e441197 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -4,6 +4,8 @@ OC.L10N.register(
"Server to server sharing is not enabled on this server" : "Sunucudan sunucuya paylaşım bu sunucuda etkin değil",
"The mountpoint name contains invalid characters." : "Bağlama noktası adı geçersiz karakterler içeriyor.",
"Invalid or untrusted SSL certificate" : "Geçersiz veya güvenilmeyen SSL sertifikası",
+ "Could not authenticate to remote share, password might be wrong" : "Uzak paylaşım kimliği doğrulanamadı, parola hatalı olabilir",
+ "Storage not valid" : "Depolama geçerli 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ış",
@@ -47,7 +49,7 @@ OC.L10N.register(
"Download" : "İndir",
"Download %s" : "İndir: %s",
"Direct link" : "Doğrudan bağlantı",
- "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı",
+ "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
"Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver",
"Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver"
},
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index bd6b9a3847b..b432345a618 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -2,6 +2,8 @@
"Server to server sharing is not enabled on this server" : "Sunucudan sunucuya paylaşım bu sunucuda etkin değil",
"The mountpoint name contains invalid characters." : "Bağlama noktası adı geçersiz karakterler içeriyor.",
"Invalid or untrusted SSL certificate" : "Geçersiz veya güvenilmeyen SSL sertifikası",
+ "Could not authenticate to remote share, password might be wrong" : "Uzak paylaşım kimliği doğrulanamadı, parola hatalı olabilir",
+ "Storage not valid" : "Depolama geçerli 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ış",
@@ -45,7 +47,7 @@
"Download" : "İndir",
"Download %s" : "İndir: %s",
"Direct link" : "Doğrudan bağlantı",
- "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı",
+ "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
"Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver",
"Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index 40f331d7b27..135b0550558 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Download" : "Завантажити",
"Download %s" : "Завантажити %s",
"Direct link" : "Пряме посилання",
- "Server-to-Server Sharing" : "Публікація між серверами",
"Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
"Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів"
},
diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json
index 12199b3192a..21f4f5efb52 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -45,7 +45,6 @@
"Download" : "Завантажити",
"Download %s" : "Завантажити %s",
"Direct link" : "Пряме посилання",
- "Server-to-Server Sharing" : "Публікація між серверами",
"Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
"Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів"
},"pluralForm" :"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/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 1d8eabc1984..cd013d4ca96 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -142,7 +142,6 @@ class ShareController extends Controller {
return new TemplateResponse('core', '404', array(), 'guest');
}
- $linkItem = OCP\Share::getShareByToken($token, false);
$shareOwner = $linkItem['uid_owner'];
$originalSharePath = null;
$rootLinkItem = OCP\Share::resolveReShare($linkItem);
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 57dc38a9954..8985aeb3fce 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -14,6 +14,11 @@ class Manager {
const STORAGE = '\OCA\Files_Sharing\External\Storage';
/**
+ * @var string
+ */
+ private $uid;
+
+ /**
* @var \OCP\IDBConnection
*/
private $connection;
@@ -29,11 +34,6 @@ class Manager {
private $storageLoader;
/**
- * @var \OC\User\Session
- */
- private $userSession;
-
- /**
* @var \OC\HTTPHelper
*/
private $httpHelper;
@@ -41,21 +41,35 @@ class Manager {
/**
* @param \OCP\IDBConnection $connection
* @param \OC\Files\Mount\Manager $mountManager
- * @param \OC\User\Session $userSession
* @param \OC\Files\Storage\StorageFactory $storageLoader
+ * @param \OC\HTTPHelper $httpHelper
+ * @param string $uid
*/
public function __construct(\OCP\IDBConnection $connection, \OC\Files\Mount\Manager $mountManager,
- \OC\Files\Storage\StorageFactory $storageLoader, \OC\User\Session $userSession, \OC\HTTPHelper $httpHelper) {
+ \OC\Files\Storage\StorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) {
$this->connection = $connection;
$this->mountManager = $mountManager;
- $this->userSession = $userSession;
$this->storageLoader = $storageLoader;
$this->httpHelper = $httpHelper;
+ $this->uid = $uid;
}
+ /**
+ * add new server-to-server share
+ *
+ * @param string $remote
+ * @param string $token
+ * @param string $password
+ * @param string $name
+ * @param string $owner
+ * @param boolean $accepted
+ * @param string $user
+ * @param int $remoteId
+ * @return mixed
+ */
public function addShare($remote, $token, $password, $name, $owner, $accepted=false, $user = null, $remoteId = -1) {
- $user = $user ? $user: $this->userSession->getUser()->getUID();
+ $user = $user ? $user : $this->uid;
$accepted = $accepted ? 1 : 0;
$mountPoint = Filesystem::normalizePath('/' . $name);
@@ -86,14 +100,13 @@ class Manager {
return false;
}
- $user = $this->userSession->getUser();
- if ($user) {
+ if (!is_null($this->uid)) {
$query = $this->connection->prepare('
SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
FROM `*PREFIX*share_external`
WHERE `user` = ? AND `accepted` = ?
');
- $query->execute(array($user->getUID(), 1));
+ $query->execute(array($this->uid, 1));
while ($row = $query->fetch()) {
$row['manager'] = $this;
@@ -114,7 +127,7 @@ class Manager {
SELECT `remote`, `share_token`
FROM `*PREFIX*share_external`
WHERE `id` = ? AND `user` = ?');
- $result = $getShare->execute(array($id, $this->userSession->getUser()->getUID()));
+ $result = $getShare->execute(array($id, $this->uid));
return $result ? $getShare->fetch() : false;
}
@@ -133,7 +146,7 @@ class Manager {
UPDATE `*PREFIX*share_external`
SET `accepted` = ?
WHERE `id` = ? AND `user` = ?');
- $acceptShare->execute(array(1, $id, $this->userSession->getUser()->getUID()));
+ $acceptShare->execute(array(1, $id, $this->uid));
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $id, 'accept');
}
}
@@ -150,7 +163,7 @@ class Manager {
if ($share) {
$removeShare = $this->connection->prepare('
DELETE FROM `*PREFIX*share_external` WHERE `id` = ? AND `user` = ?');
- $removeShare->execute(array($id, $this->userSession->getUser()->getUID()));
+ $removeShare->execute(array($id, $this->uid));
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $id, 'decline');
}
}
@@ -175,19 +188,31 @@ class Manager {
return ($result['success'] && $status['ocs']['meta']['statuscode'] === 100);
}
- public static function setup() {
+ /**
+ * setup the server-to-server mounts
+ *
+ * @param array $params
+ */
+ public static function setup(array $params) {
$externalManager = new \OCA\Files_Sharing\External\Manager(
\OC::$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- \OC::$server->getUserSession(),
- \OC::$server->getHTTPHelper()
+ \OC::$server->getHTTPHelper(),
+ $params['user']
);
+
$externalManager->setupMounts();
}
+ /**
+ * remove '/user/files' from the path and trailing slashes
+ *
+ * @param string $path
+ * @return string
+ */
protected function stripPath($path) {
- $prefix = '/' . $this->userSession->getUser()->getUID() . '/files';
+ $prefix = '/' . $this->uid . '/files';
return rtrim(substr($path, strlen($prefix)), '/');
}
@@ -196,11 +221,10 @@ class Manager {
* @return Mount
*/
protected function mountShare($data) {
- $user = $this->userSession->getUser();
$data['manager'] = $this;
- $mountPoint = '/' . $user->getUID() . '/files' . $data['mountpoint'];
+ $mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
$data['mountpoint'] = $mountPoint;
- $data['certificateManager'] = \OC::$server->getCertificateManager($user);
+ $data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
$mount = new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
$this->mountManager->addMount($mount);
return $mount;
@@ -219,7 +243,6 @@ class Manager {
* @return bool
*/
public function setMountPoint($source, $target) {
- $user = $this->userSession->getUser();
$source = $this->stripPath($source);
$target = $this->stripPath($target);
$sourceHash = md5($source);
@@ -231,13 +254,12 @@ class Manager {
WHERE `mountpoint_hash` = ?
AND `user` = ?
');
- $result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $user->getUID()));
+ $result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $this->uid));
return $result;
}
public function removeShare($mountPoint) {
- $user = $this->userSession->getUser();
$mountPoint = $this->stripPath($mountPoint);
$hash = md5($mountPoint);
@@ -245,7 +267,7 @@ class Manager {
SELECT `remote`, `share_token`, `remote_id`
FROM `*PREFIX*share_external`
WHERE `mountpoint_hash` = ? AND `user` = ?');
- $result = $getShare->execute(array($hash, $user->getUID()));
+ $result = $getShare->execute(array($hash, $this->uid));
if ($result) {
$share = $getShare->fetch();
@@ -257,7 +279,7 @@ class Manager {
WHERE `mountpoint_hash` = ?
AND `user` = ?
');
- return (bool)$query->execute(array($hash, $user->getUID()));
+ return (bool)$query->execute(array($hash, $this->uid));
}
/**
@@ -294,7 +316,7 @@ class Manager {
*/
public function getOpenShares() {
$openShares = $this->connection->prepare('SELECT * FROM `*PREFIX*share_external` WHERE `accepted` = ? AND `user` = ?');
- $result = $openShares->execute(array(0, $this->userSession->getUser()->getUID()));
+ $result = $openShares->execute(array(0, $this->uid));
return $result ? $openShares->fetchAll() : array();
diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php
index 4e61e0c4ccb..b45a8942e96 100644
--- a/apps/files_sharing/lib/external/scanner.php
+++ b/apps/files_sharing/lib/external/scanner.php
@@ -8,6 +8,11 @@
namespace OCA\Files_Sharing\External;
+use OC\ForbiddenException;
+use OCP\Files\NotFoundException;
+use OCP\Files\StorageInvalidException;
+use OCP\Files\StorageNotAvailableException;
+
class Scanner extends \OC\Files\Cache\Scanner {
/**
* @var \OCA\Files_Sharing\External\Storage
@@ -18,12 +23,56 @@ class Scanner extends \OC\Files\Cache\Scanner {
$this->scanAll();
}
+ /**
+ * Scan a single file and store it in the cache.
+ * If an exception happened while accessing the external storage,
+ * the storage will be checked for availability and removed
+ * if it is not available any more.
+ *
+ * @param string $file file to scan
+ * @param int $reuseExisting
+ * @return array an array of metadata of the scanned file
+ */
+ public function scanFile($file, $reuseExisting = 0) {
+ try {
+ return parent::scanFile($file, $reuseExisting);
+ } catch (ForbiddenException $e) {
+ $this->storage->checkStorageAvailability();
+ } catch (NotFoundException $e) {
+ // if the storage isn't found, the call to
+ // checkStorageAvailable() will verify it and remove it
+ // if appropriate
+ $this->storage->checkStorageAvailability();
+ } catch (StorageInvalidException $e) {
+ $this->storage->checkStorageAvailability();
+ } catch (StorageNotAvailableException $e) {
+ $this->storage->checkStorageAvailability();
+ }
+ }
+
+ /**
+ * Checks the remote share for changes.
+ * If changes are available, scan them and update
+ * the cache.
+ */
public function scanAll() {
- $data = $this->storage->getShareInfo();
+ try {
+ $data = $this->storage->getShareInfo();
+ } catch (\Exception $e) {
+ $this->storage->checkStorageAvailability();
+ throw new \Exception(
+ 'Error while scanning remote share: "' .
+ $this->storage->getRemote() . '" ' .
+ $e->getMessage()
+ );
+ }
if ($data['status'] === 'success') {
$this->addResult($data['data'], '');
} else {
- throw new \Exception('Error while scanning remote share');
+ throw new \Exception(
+ 'Error while scanning remote share: "' .
+ $this->storage->getRemote() . '"'
+ );
}
}
diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index 0d41176e45a..648376e8cb5 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -142,27 +142,47 @@ class Storage extends DAV implements ISharedStorage {
$this->updateChecked = true;
try {
return parent::hasUpdated('', $time);
+ } catch (StorageInvalidException $e) {
+ // check if it needs to be removed
+ $this->checkStorageAvailability();
+ throw $e;
} catch (StorageNotAvailableException $e) {
- // see if we can find out why the share is unavailable\
- try {
- $this->getShareInfo();
- } catch (NotFoundException $shareException) {
- // a 404 can either mean that the share no longer exists or there is no ownCloud on the remote
- if ($this->testRemote()) {
- // valid ownCloud instance means that the public share no longer exists
- // since this is permanent (re-sharing the file will create a new token)
- // we remove the invalid storage
- $this->manager->removeShare($this->mountPoint);
- $this->manager->getMountManager()->removeMount($this->mountPoint);
- throw new StorageInvalidException();
- } else {
- // ownCloud instance is gone, likely to be a temporary server configuration error
- throw $e;
- }
- } catch (\Exception $shareException) {
- // todo, maybe handle 403 better and ask the user for a new password
+ // check if it needs to be removed or just temp unavailable
+ $this->checkStorageAvailability();
+ throw $e;
+ }
+ }
+
+ /**
+ * Check whether this storage is permanently or temporarily
+ * unavailable
+ *
+ * @throws \OCP\Files\StorageNotAvailableException
+ * @throws \OCP\Files\StorageInvalidException
+ */
+ public function checkStorageAvailability() {
+ // see if we can find out why the share is unavailable
+ try {
+ $this->getShareInfo();
+ } catch (NotFoundException $e) {
+ // a 404 can either mean that the share no longer exists or there is no ownCloud on the remote
+ if ($this->testRemote()) {
+ // valid ownCloud instance means that the public share no longer exists
+ // since this is permanent (re-sharing the file will create a new token)
+ // we remove the invalid storage
+ $this->manager->removeShare($this->mountPoint);
+ $this->manager->getMountManager()->removeMount($this->mountPoint);
+ throw new StorageInvalidException();
+ } else {
+ // ownCloud instance is gone, likely to be a temporary server configuration error
throw $e;
}
+ } catch (ForbiddenException $e) {
+ // auth error, remove share for now (provide a dialog in the future)
+ $this->manager->removeShare($this->mountPoint);
+ $this->manager->getMountManager()->removeMount($this->mountPoint);
+ throw new StorageInvalidException();
+ } catch (\Exception $e) {
throw $e;
}
}
@@ -194,7 +214,7 @@ class Storage extends DAV implements ISharedStorage {
$remote = $this->getRemote();
$token = $this->getToken();
$password = $this->getPassword();
- $url = $remote . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
+ $url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
$ch = curl_init();
diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php
index 6f23c103b1d..10e16be4a91 100644
--- a/apps/files_sharing/lib/hooks.php
+++ b/apps/files_sharing/lib/hooks.php
@@ -30,8 +30,8 @@ class Hooks {
\OC::$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- \OC::$server->getUserSession(),
- \OC::$server->getHTTPHelper());
+ \OC::$server->getHTTPHelper(),
+ $params['uid']);
$manager->removeUserShares($params['uid']);
}
diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php
index c71ef31b21c..9fac97faf55 100644
--- a/apps/files_sharing/templates/settings-admin.php
+++ b/apps/files_sharing/templates/settings-admin.php
@@ -4,7 +4,7 @@
?>
<div class="section" id="fileSharingSettings" >
- <h2><?php p($l->t('Server-to-Server Sharing'));?></h2>
+ <h2><?php p($l->t('Federated Cloud Sharing'));?></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/js/externalSpec.js b/apps/files_sharing/tests/js/externalSpec.js
index 2f8f4508d46..255f0fc3a48 100644
--- a/apps/files_sharing/tests/js/externalSpec.js
+++ b/apps/files_sharing/tests/js/externalSpec.js
@@ -31,7 +31,7 @@ describe('OCA.Sharing external tests', function() {
fileList: {
reload: sinon.stub()
}
- }
+ };
});
afterEach(function() {
urlQueryStub.restore();
@@ -118,6 +118,124 @@ describe('OCA.Sharing external tests', function() {
});
});
describe('show dialog for each share to confirm', function() {
- // TODO test plugin.processSharesToConfirm()
+ var testShare;
+
+ /**
+ * Call processSharesToConfirm() and make the fake server
+ * return the passed response.
+ *
+ * @param {Array} response list of shares to process
+ */
+ function processShares(response) {
+ plugin.processSharesToConfirm();
+
+ expect(fakeServer.requests.length).toEqual(1);
+
+ var req = fakeServer.requests[0];
+ expect(req.method).toEqual('GET');
+ expect(req.url).toEqual(OC.webroot + '/index.php/apps/files_sharing/api/externalShares');
+
+ req.respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify(response)
+ );
+ }
+
+ beforeEach(function() {
+ testShare = {
+ id: 123,
+ remote: 'http://example.com/owncloud',
+ token: 'abcdefg',
+ owner: 'theowner',
+ name: 'the share name'
+ };
+ });
+
+ it('does not show any dialog if no shares to confirm', function() {
+ processShares([]);
+ expect(confirmDialogStub.notCalled).toEqual(true);
+ expect(promptDialogStub.notCalled).toEqual(true);
+ });
+ it('sends accept info to server on confirm', function() {
+ processShares([testShare]);
+
+ expect(promptDialogStub.notCalled).toEqual(true);
+ expect(confirmDialogStub.calledOnce).toEqual(true);
+
+ confirmDialogStub.getCall(0).args[2](true);
+
+ expect(fakeServer.requests.length).toEqual(2);
+
+ var request = fakeServer.requests[1];
+ var query = OC.parseQueryString(request.requestBody);
+ expect(request.method).toEqual('POST');
+ expect(query).toEqual({id: '123'});
+ expect(request.url).toEqual(
+ OC.webroot + '/index.php/apps/files_sharing/api/externalShares'
+ );
+
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+ request.respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify({status: 'success'})
+ );
+ expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true);
+ });
+ it('sends delete info to server on cancel', function() {
+ processShares([testShare]);
+
+ expect(promptDialogStub.notCalled).toEqual(true);
+ expect(confirmDialogStub.calledOnce).toEqual(true);
+
+ confirmDialogStub.getCall(0).args[2](false);
+
+ expect(fakeServer.requests.length).toEqual(2);
+
+ var request = fakeServer.requests[1];
+ expect(request.method).toEqual('DELETE');
+ expect(request.url).toEqual(
+ OC.webroot + '/index.php/apps/files_sharing/api/externalShares/123'
+ );
+
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+ request.respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify({status: 'success'})
+ );
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+ });
+ xit('shows another dialog when multiple shares need to be accepted', function() {
+ // TODO: enable this test when fixing multiple dialogs issue / confirm loop
+ var testShare2 = _.extend({}, testShare);
+ testShare2.id = 256;
+ processShares([testShare, testShare2]);
+
+ // confirm first one
+ expect(confirmDialogStub.calledOnce).toEqual(true);
+ confirmDialogStub.getCall(0).args[2](true);
+
+ // next dialog not shown yet
+ expect(confirmDialogStub.calledOnce);
+
+ // respond to the first accept request
+ fakeServer.requests[1].respond(
+ 200,
+ {'Content-Type': 'application/json'},
+ JSON.stringify({status: 'success'})
+ );
+
+ // don't reload yet, there are other shares to confirm
+ expect(plugin.filesApp.fileList.reload.notCalled).toEqual(true);
+
+ // cancel second share
+ expect(confirmDialogStub.calledTwice).toEqual(true);
+ confirmDialogStub.getCall(1).args[2](true);
+
+ // reload only called at the very end
+ expect(plugin.filesApp.fileList.reload.calledOnce).toEqual(true);
+ });
});
});
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index e5b5de314d7..1b1e363b792 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -27,7 +27,7 @@ describe('OCA.Sharing.Util tests', function() {
$('#testArea').append($content);
// dummy file list
var $div = $(
- '<div>' +
+ '<div id="listContainer">' +
'<table id="filestable">' +
'<thead></thead>' +
'<tbody id="fileList"></tbody>' +
@@ -450,5 +450,29 @@ describe('OCA.Sharing.Util tests', function() {
.toEqual('User four, User one, User three, User two, +6');
});
});
+ describe('Excluded lists', function() {
+ function createListThenAttach(listId) {
+ var fileActions = new OCA.Files.FileActions();
+ fileList.destroy();
+ fileList = new OCA.Files.FileList(
+ $('#listContainer'), {
+ id: listId,
+ fileActions: fileActions
+ }
+ );
+ OCA.Sharing.Util.attach(fileList);
+ fileList.setFiles(testFiles);
+ return fileList;
+ }
+
+ it('does not attach to trashbin or public file lists', function() {
+ createListThenAttach('trashbin');
+ expect($('.action-share').length).toEqual(0);
+ expect($('[data-share-recipient]').length).toEqual(0);
+ createListThenAttach('files.public');
+ expect($('.action-share').length).toEqual(0);
+ expect($('[data-share-recipient]').length).toEqual(0);
+ });
+ });
});
diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php
index 2d59f7be9cd..6e9c0dd0ddd 100644
--- a/apps/files_sharing/tests/server2server.php
+++ b/apps/files_sharing/tests/server2server.php
@@ -153,8 +153,9 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase {
\OC::$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
- \OC::$server->getUserSession(),
- \OC::$server->getHTTPHelper());
+ \OC::$server->getHTTPHelper(),
+ $toDelete
+ );
$manager->removeUserShares($toDelete);
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 7ab1564bc3d..2959b9aacfb 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -46,6 +46,8 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
$this->view->unlink($this->folder);
$this->view->unlink($this->filename);
+ \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
+
parent::tearDown();
}
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 1d6ec8caa61..cdaff0d0a56 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -111,6 +111,8 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
if ($status === false) {
\OC_App::disable('files_trashbin');
}
+
+ \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
}
/**
diff --git a/apps/files_trashbin/l10n/bg_BG.js b/apps/files_trashbin/l10n/bg_BG.js
index eae24b14a1b..9db73c98a6d 100644
--- a/apps/files_trashbin/l10n/bg_BG.js
+++ b/apps/files_trashbin/l10n/bg_BG.js
@@ -8,6 +8,10 @@ OC.L10N.register(
"Delete permanently" : "Изтрий завинаги",
"Error" : "Грешка",
"restored" : "възстановено",
+ "No deleted files" : "Няма изтрити файлове",
+ "You will be able to recover deleted files from here" : "Имате възможност да възстановите изтрити файлове от тук",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"Name" : "Име",
"Deleted" : "Изтрито",
"Delete" : "Изтрий"
diff --git a/apps/files_trashbin/l10n/bg_BG.json b/apps/files_trashbin/l10n/bg_BG.json
index 2e83d97304c..3f3b3e8b835 100644
--- a/apps/files_trashbin/l10n/bg_BG.json
+++ b/apps/files_trashbin/l10n/bg_BG.json
@@ -6,6 +6,10 @@
"Delete permanently" : "Изтрий завинаги",
"Error" : "Грешка",
"restored" : "възстановено",
+ "No deleted files" : "Няма изтрити файлове",
+ "You will be able to recover deleted files from here" : "Имате възможност да възстановите изтрити файлове от тук",
+ "No entries found in this folder" : "Няма намерени записи в тази папка",
+ "Select all" : "Избери всички",
"Name" : "Име",
"Deleted" : "Изтрито",
"Delete" : "Изтрий"
diff --git a/apps/files_trashbin/l10n/el.js b/apps/files_trashbin/l10n/el.js
index f41ab173604..f6e38988323 100644
--- a/apps/files_trashbin/l10n/el.js
+++ b/apps/files_trashbin/l10n/el.js
@@ -9,6 +9,7 @@ OC.L10N.register(
"Error" : "Σφάλμα",
"restored" : "επαναφέρθηκαν",
"No deleted files" : "Κανένα διαγεγραμμένο αρχείο",
+ "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
"Select all" : "Επιλογή όλων",
"Name" : "Όνομα",
"Deleted" : "Διαγραμμένα",
diff --git a/apps/files_trashbin/l10n/el.json b/apps/files_trashbin/l10n/el.json
index 31fcde922b1..f76e46954ca 100644
--- a/apps/files_trashbin/l10n/el.json
+++ b/apps/files_trashbin/l10n/el.json
@@ -7,6 +7,7 @@
"Error" : "Σφάλμα",
"restored" : "επαναφέρθηκαν",
"No deleted files" : "Κανένα διαγεγραμμένο αρχείο",
+ "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
"Select all" : "Επιλογή όλων",
"Name" : "Όνομα",
"Deleted" : "Διαγραμμένα",
diff --git a/apps/files_trashbin/l10n/eu.js b/apps/files_trashbin/l10n/eu.js
index 9371bddcd88..568fda14450 100644
--- a/apps/files_trashbin/l10n/eu.js
+++ b/apps/files_trashbin/l10n/eu.js
@@ -8,6 +8,10 @@ OC.L10N.register(
"Delete permanently" : "Ezabatu betirako",
"Error" : "Errorea",
"restored" : "Berrezarrita",
+ "No deleted files" : "Ez dago ezabatutako fitxategirik",
+ "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Name" : "Izena",
"Deleted" : "Ezabatuta",
"Delete" : "Ezabatu"
diff --git a/apps/files_trashbin/l10n/eu.json b/apps/files_trashbin/l10n/eu.json
index 46378327f42..890ff07a468 100644
--- a/apps/files_trashbin/l10n/eu.json
+++ b/apps/files_trashbin/l10n/eu.json
@@ -6,6 +6,10 @@
"Delete permanently" : "Ezabatu betirako",
"Error" : "Errorea",
"restored" : "Berrezarrita",
+ "No deleted files" : "Ez dago ezabatutako fitxategirik",
+ "You will be able to recover deleted files from here" : "Hemendik ezabatutako fitxategiak berreskuratu ahal izango duzu",
+ "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
+ "Select all" : "Hautatu dena",
"Name" : "Izena",
"Deleted" : "Ezabatuta",
"Delete" : "Ezabatu"
diff --git a/apps/files_trashbin/l10n/id.js b/apps/files_trashbin/l10n/id.js
index 52183a9cbef..53827980ea9 100644
--- a/apps/files_trashbin/l10n/id.js
+++ b/apps/files_trashbin/l10n/id.js
@@ -7,6 +7,11 @@ OC.L10N.register(
"Restore" : "Pulihkan",
"Delete permanently" : "Hapus secara permanen",
"Error" : "Galat",
+ "restored" : "dipulihkan",
+ "No deleted files" : "Tidak ada berkas yang dihapus",
+ "You will be able to recover deleted files from here" : "Anda dapat memulihkan berkas yang dihapus dari sini",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Name" : "Nama",
"Deleted" : "Dihapus",
"Delete" : "Hapus"
diff --git a/apps/files_trashbin/l10n/id.json b/apps/files_trashbin/l10n/id.json
index 55384503601..d0d107a9571 100644
--- a/apps/files_trashbin/l10n/id.json
+++ b/apps/files_trashbin/l10n/id.json
@@ -5,6 +5,11 @@
"Restore" : "Pulihkan",
"Delete permanently" : "Hapus secara permanen",
"Error" : "Galat",
+ "restored" : "dipulihkan",
+ "No deleted files" : "Tidak ada berkas yang dihapus",
+ "You will be able to recover deleted files from here" : "Anda dapat memulihkan berkas yang dihapus dari sini",
+ "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
+ "Select all" : "Pilih Semua",
"Name" : "Nama",
"Deleted" : "Dihapus",
"Delete" : "Hapus"
diff --git a/apps/files_trashbin/l10n/pt_PT.js b/apps/files_trashbin/l10n/pt_PT.js
index 291d5085233..8124af21751 100644
--- a/apps/files_trashbin/l10n/pt_PT.js
+++ b/apps/files_trashbin/l10n/pt_PT.js
@@ -9,6 +9,7 @@ OC.L10N.register(
"Error" : "Erro",
"restored" : "Restaurado",
"No deleted files" : "Sem ficheiros eliminados",
+ "You will be able to recover deleted files from here" : "Poderá recuperar ficheiros apagados aqui",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Name" : "Nome",
diff --git a/apps/files_trashbin/l10n/pt_PT.json b/apps/files_trashbin/l10n/pt_PT.json
index 8fd729edc90..f1fb924af59 100644
--- a/apps/files_trashbin/l10n/pt_PT.json
+++ b/apps/files_trashbin/l10n/pt_PT.json
@@ -7,6 +7,7 @@
"Error" : "Erro",
"restored" : "Restaurado",
"No deleted files" : "Sem ficheiros eliminados",
+ "You will be able to recover deleted files from here" : "Poderá recuperar ficheiros apagados aqui",
"No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
"Select all" : "Seleccionar todos",
"Name" : "Nome",
diff --git a/apps/files_trashbin/l10n/ru.js b/apps/files_trashbin/l10n/ru.js
index 39a47584221..47b971180c3 100644
--- a/apps/files_trashbin/l10n/ru.js
+++ b/apps/files_trashbin/l10n/ru.js
@@ -10,7 +10,7 @@ OC.L10N.register(
"restored" : "восстановлен",
"No deleted files" : "Нет удалённых файлов",
"You will be able to recover deleted files from here" : "Здесь вы сможете восстановить удалённые файлы",
- "No entries found in this folder" : "Каталог пуст",
+ "No entries found in this folder" : "Нет элементов в этом каталоге",
"Select all" : "Выделить все",
"Name" : "Имя",
"Deleted" : "Удалён",
diff --git a/apps/files_trashbin/l10n/ru.json b/apps/files_trashbin/l10n/ru.json
index 171c0aa2325..3d38b545ad7 100644
--- a/apps/files_trashbin/l10n/ru.json
+++ b/apps/files_trashbin/l10n/ru.json
@@ -8,7 +8,7 @@
"restored" : "восстановлен",
"No deleted files" : "Нет удалённых файлов",
"You will be able to recover deleted files from here" : "Здесь вы сможете восстановить удалённые файлы",
- "No entries found in this folder" : "Каталог пуст",
+ "No entries found in this folder" : "Нет элементов в этом каталоге",
"Select all" : "Выделить все",
"Name" : "Имя",
"Deleted" : "Удалён",
diff --git a/apps/files_trashbin/l10n/sk_SK.js b/apps/files_trashbin/l10n/sk_SK.js
index 2ab3d37de34..483691acf99 100644
--- a/apps/files_trashbin/l10n/sk_SK.js
+++ b/apps/files_trashbin/l10n/sk_SK.js
@@ -5,9 +5,11 @@ OC.L10N.register(
"Couldn't restore %s" : "Nemožno obnoviť %s",
"Deleted files" : "Zmazané súbory",
"Restore" : "Obnoviť",
- "Delete permanently" : "Zmazať trvalo",
+ "Delete permanently" : "Zmazať natrvalo",
"Error" : "Chyba",
"restored" : "obnovené",
+ "No deleted files" : "Žiadne zmazané súbory",
+ "You will be able to recover deleted files from here" : "Tu budete mať možnosť obnoviť zmazané súbory",
"No entries found in this folder" : "V tomto priečinku nebolo nič nájdené",
"Select all" : "Vybrať všetko",
"Name" : "Názov",
diff --git a/apps/files_trashbin/l10n/sk_SK.json b/apps/files_trashbin/l10n/sk_SK.json
index 6366b7e4c78..90b91cd92be 100644
--- a/apps/files_trashbin/l10n/sk_SK.json
+++ b/apps/files_trashbin/l10n/sk_SK.json
@@ -3,9 +3,11 @@
"Couldn't restore %s" : "Nemožno obnoviť %s",
"Deleted files" : "Zmazané súbory",
"Restore" : "Obnoviť",
- "Delete permanently" : "Zmazať trvalo",
+ "Delete permanently" : "Zmazať natrvalo",
"Error" : "Chyba",
"restored" : "obnovené",
+ "No deleted files" : "Žiadne zmazané súbory",
+ "You will be able to recover deleted files from here" : "Tu budete mať možnosť obnoviť zmazané súbory",
"No entries found in this folder" : "V tomto priečinku nebolo nič nájdené",
"Select all" : "Vybrať všetko",
"Name" : "Názov",
diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/storage.php
index aa5d48b5fbe..175889ef95d 100644
--- a/apps/files_trashbin/lib/storage.php
+++ b/apps/files_trashbin/lib/storage.php
@@ -23,6 +23,7 @@
namespace OCA\Files_Trashbin;
+use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Wrapper;
class Storage extends Wrapper {
@@ -32,24 +33,62 @@ class Storage extends Wrapper {
// move files across storages
private $deletedFiles = array();
+ /**
+ * Disable trash logic
+ *
+ * @var bool
+ */
+ private static $disableTrash = false;
+
function __construct($parameters) {
$this->mountPoint = $parameters['mountPoint'];
parent::__construct($parameters);
}
+ /**
+ * @internal
+ */
+ public static function preRenameHook($params) {
+ // in cross-storage cases, a rename is a copy + unlink,
+ // that last unlink must not go to trash
+ self::$disableTrash = true;
+ }
+
+ /**
+ * @internal
+ */
+ public static function postRenameHook($params) {
+ self::$disableTrash = false;
+ }
+
+ /**
+ * Deletes the given file by moving it into the trashbin.
+ *
+ * @param string $path
+ */
public function unlink($path) {
- $normalized = \OC\Files\Filesystem::normalizePath($this->mountPoint . '/' . $path);
+ if (self::$disableTrash) {
+ return $this->storage->unlink($path);
+ }
+ $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
$result = true;
if (!isset($this->deletedFiles[$normalized])) {
+ $view = Filesystem::getView();
$this->deletedFiles[$normalized] = $normalized;
- $parts = explode('/', $normalized);
- if (count($parts) > 3 && $parts[2] === 'files') {
- $filesPath = implode('/', array_slice($parts, 3));
+ if ($filesPath = $view->getRelativePath($normalized)) {
+ $filesPath = trim($filesPath, '/');
$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
+ // in cross-storage cases the file will be copied
+ // but not deleted, so we delete it here
+ if ($result) {
+ $this->storage->unlink($path);
+ }
} else {
$result = $this->storage->unlink($path);
}
unset($this->deletedFiles[$normalized]);
+ } else if ($this->storage->file_exists($path)) {
+ $result = $this->storage->unlink($path);
}
return $result;
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index f5cebea6b78..8ce6d668d66 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -152,7 +152,6 @@ class Trashbin {
self::setUpTrash($user);
- $view = new \OC\Files\View('/' . $user);
$path_parts = pathinfo($file_path);
$filename = $path_parts['basename'];
@@ -167,6 +166,9 @@ class Trashbin {
$trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
try {
$sizeOfAddedFiles = $view->filesize('/files/' . $file_path);
+ if ($view->file_exists($trashPath)) {
+ $view->unlink($trashPath);
+ }
$view->rename('/files/' . $file_path, $trashPath);
} catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) {
$sizeOfAddedFiles = false;
@@ -177,6 +179,11 @@ class Trashbin {
}
\OC_FileProxy::$enabled = $proxyStatus;
+ if ($view->file_exists('/files/' . $file_path)) { // failed to delete the original file, abort
+ $view->unlink($trashPath);
+ return false;
+ }
+
if ($sizeOfAddedFiles !== false) {
$size = $sizeOfAddedFiles;
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");
@@ -928,6 +935,9 @@ class Trashbin {
\OCP\Util::connectHook('OC_User', 'pre_deleteUser', 'OCA\Files_Trashbin\Hooks', 'deleteUser_hook');
//Listen to post write hook
\OCP\Util::connectHook('OC_Filesystem', 'post_write', 'OCA\Files_Trashbin\Hooks', 'post_write_hook');
+ // pre and post-rename, disable trash logic for the copy+unlink case
+ \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Trashbin\Storage', 'preRenameHook');
+ \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Trashbin\Storage', 'postRenameHook');
}
/**
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php
new file mode 100644
index 00000000000..24a04e68b2a
--- /dev/null
+++ b/apps/files_trashbin/tests/storage.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_trashbin\Tests\Storage;
+
+use OC\Files\Storage\Home;
+use OC\Files\Storage\Temporary;
+use OC\Files\Mount\MountPoint;
+use OC\Files\Filesystem;
+
+class Storage extends \Test\TestCase {
+ /**
+ * @var string
+ */
+ private $user;
+
+ /**
+ * @var \OC\Files\Storage\Storage
+ **/
+ private $originalStorage;
+
+ /**
+ * @var \OC\Files\View
+ */
+ private $rootView;
+
+ /**
+ * @var \OC\Files\View
+ */
+ private $userView;
+
+ protected function setUp() {
+ parent::setUp();
+
+ \OC_Hook::clear();
+ \OCA\Files_Trashbin\Trashbin::registerHooks();
+
+ $this->user = $this->getUniqueId('user');
+ \OC::$server->getUserManager()->createUser($this->user, $this->user);
+
+ // this will setup the FS
+ $this->loginAsUser($this->user);
+
+ $this->originalStorage = \OC\Files\Filesystem::getStorage('/');
+
+ \OCA\Files_Trashbin\Storage::setupStorage();
+
+ $this->rootView = new \OC\Files\View('/');
+ $this->userView = new \OC\Files\View('/' . $this->user . '/files/');
+ $this->userView->file_put_contents('test.txt', 'foo');
+
+ }
+
+ protected function tearDown() {
+ \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
+ \OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+ $this->logout();
+ \OC_User::deleteUser($this->user);
+ \OC_Hook::clear();
+ parent::tearDown();
+ }
+
+ /**
+ * Test that deleting a file puts it into the trashbin.
+ */
+ public function testSingleStorageDelete() {
+ $this->assertTrue($this->userView->file_exists('test.txt'));
+ $this->userView->unlink('test.txt');
+ list($storage,) = $this->userView->resolvePath('test.txt');
+ $storage->getScanner()->scan(''); // make sure we check the storage
+ $this->assertFalse($this->userView->getFileInfo('test.txt'));
+
+ // check if file is in trashbin
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files/');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('test.txt', substr($name, 0, strrpos($name, '.')));
+ }
+
+ /**
+ * Test that deleting a file from another mounted storage properly
+ * lands in the trashbin. This is a cross-storage situation because
+ * the trashbin folder is in the root storage while the mounted one
+ * isn't.
+ */
+ public function testCrossStorageDelete() {
+ $storage2 = new Temporary(array());
+ \OC\Files\Filesystem::mount($storage2, array(), $this->user . '/files/substorage');
+
+ $this->userView->file_put_contents('substorage/subfile.txt', 'foo');
+ $storage2->getScanner()->scan('');
+ $this->assertTrue($storage2->file_exists('subfile.txt'));
+ $this->userView->unlink('substorage/subfile.txt');
+
+ $storage2->getScanner()->scan('');
+ $this->assertFalse($this->userView->getFileInfo('substorage/subfile.txt'));
+ $this->assertFalse($storage2->file_exists('subfile.txt'));
+
+ // check if file is in trashbin
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('subfile.txt', substr($name, 0, strrpos($name, '.')));
+ }
+
+ /**
+ * Test that deleted versions properly land in the trashbin.
+ */
+ public function testDeleteVersions() {
+ \OCA\Files_Versions\Hooks::connectHooks();
+
+ // trigger a version (multiple would not work because of the expire logic)
+ $this->userView->file_put_contents('test.txt', 'v1');
+
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/');
+ $this->assertEquals(1, count($results));
+
+ $this->userView->unlink('test.txt');
+
+ // rescan trash storage
+ list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin');
+ $rootStorage->getScanner()->scan('');
+
+ // check if versions are in trashbin
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions');
+ $this->assertEquals(1, count($results));
+ $name = $results[0]->getName();
+ $this->assertEquals('test.txt', substr($name, 0, strlen('test.txt')));
+ }
+
+ /**
+ * Test that versions are not auto-trashed when moving a file between
+ * storages. This is because rename() between storages would call
+ * unlink() which should NOT trigger the version deletion logic.
+ */
+ public function testKeepFileAndVersionsWhenMovingBetweenStorages() {
+ \OCA\Files_Versions\Hooks::connectHooks();
+
+ $storage2 = new Temporary(array());
+ \OC\Files\Filesystem::mount($storage2, array(), $this->user . '/files/substorage');
+
+ // trigger a version (multiple would not work because of the expire logic)
+ $this->userView->file_put_contents('test.txt', 'v1');
+
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files');
+ $this->assertEquals(0, count($results));
+
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/');
+ $this->assertEquals(1, count($results));
+
+ // move to another storage
+ $this->userView->rename('test.txt', 'substorage/test.txt');
+ $this->userView->file_exists('substorage/test.txt');
+
+ // rescan trash storage
+ list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin');
+ $rootStorage->getScanner()->scan('');
+
+ // versions were moved too
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/substorage');
+ $this->assertEquals(1, count($results));
+
+ // check that nothing got trashed by the rename's unlink() call
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files');
+ $this->assertEquals(0, count($results));
+
+ // check that versions were moved and not trashed
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions/');
+ $this->assertEquals(0, count($results));
+ }
+
+ /**
+ * Delete should fail is the source file cant be deleted
+ */
+ public function testSingleStorageDeleteFail() {
+ /**
+ * @var \OC\Files\Storage\Temporary | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+ ->setConstructorArgs([[]])
+ ->setMethods(['rename', 'unlink'])
+ ->getMock();
+
+ $storage->expects($this->any())
+ ->method('rename')
+ ->will($this->returnValue(false));
+ $storage->expects($this->any())
+ ->method('unlink')
+ ->will($this->returnValue(false));
+
+ $cache = $storage->getCache();
+
+ Filesystem::mount($storage, [], '/' . $this->user . '/files');
+ $this->userView->file_put_contents('test.txt', 'foo');
+ $this->assertTrue($storage->file_exists('test.txt'));
+ $this->assertFalse($this->userView->unlink('test.txt'));
+ $this->assertTrue($storage->file_exists('test.txt'));
+ $this->assertTrue($cache->inCache('test.txt'));
+
+ // file should not be in the trashbin
+ $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files/');
+ $this->assertEquals(0, count($results));
+ }
+}
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index f572e22623e..17e38015868 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -88,6 +88,8 @@ class Test_Trashbin extends \Test\TestCase {
\OC_Hook::clear();
+ \OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
+
parent::tearDownAfterClass();
}
diff --git a/apps/files_versions/l10n/ar.js b/apps/files_versions/l10n/ar.js
index ee0199f5b11..81390bc50a9 100644
--- a/apps/files_versions/l10n/ar.js
+++ b/apps/files_versions/l10n/ar.js
@@ -1,7 +1,11 @@
OC.L10N.register(
"files_versions",
{
+ "Could not revert: %s" : "غير قادر على الاستعادة : %s",
"Versions" : "الإصدارات",
- "Restore" : "استعيد"
+ "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}",
+ "More versions..." : "المزيد من الإصدارات",
+ "No other versions available" : "لا توجد إصدارات أخرى متاحة",
+ "Restore" : "استعادة "
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/files_versions/l10n/ar.json b/apps/files_versions/l10n/ar.json
index e84fbfc56c2..683df8a7c0e 100644
--- a/apps/files_versions/l10n/ar.json
+++ b/apps/files_versions/l10n/ar.json
@@ -1,5 +1,9 @@
{ "translations": {
+ "Could not revert: %s" : "غير قادر على الاستعادة : %s",
"Versions" : "الإصدارات",
- "Restore" : "استعيد"
+ "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}",
+ "More versions..." : "المزيد من الإصدارات",
+ "No other versions available" : "لا توجد إصدارات أخرى متاحة",
+ "Restore" : "استعادة "
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
} \ No newline at end of file
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index 3f1fa745cf5..7c662c18c09 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -19,4 +19,8 @@
<documentation>
<admin>admin-provisioning-api</admin>
</documentation>
+ <types>
+ <!-- this is used to disable the feature of enabling an app for specific groups only because this would break this app -->
+ <filesystem/>
+ </types>
</info>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index a1a934f0140..88462902421 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -18,4 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
<admin>admin-ldap</admin>
</documentation>
<ocsid>166061</ocsid>
+ <dependencies>
+ <lib>ldap</lib>
+ </dependencies>
</info>
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
deleted file mode 100644
index b4121b19852..00000000000
--- a/apps/user_ldap/appinfo/update.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-$configInstance = \OC::$server->getConfig();
-
-//detect if we can switch on naming guidelines. We won't do it on conflicts.
-//it's a bit spaghetti, but hey.
-$state = $configInstance->getSystemValue('ldapIgnoreNamingRules', 'unset');
-if($state === 'unset') {
- $configInstance->setSystemValue('ldapIgnoreNamingRules', false);
-}
-
-$installedVersion = $configInstance->getAppValue('user_ldap', 'installed_version');
-$enableRawMode = version_compare($installedVersion, '0.4.1', '<');
-
-$helper = new \OCA\user_ldap\lib\Helper();
-$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-$ldap = new OCA\user_ldap\lib\LDAP();
-foreach($configPrefixes as $config) {
- $connection = new OCA\user_ldap\lib\Connection($ldap, $config);
-
- $state = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_uuid_user_attribute', 'not existing');
- if($state === 'non existing') {
- $value = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_uuid_attribute', '');
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_uuid_user_attribute', $value);
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_uuid_group_attribute', $value);
- }
-
- $state = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_user_attr', 'not existing');
- if($state === 'non existing') {
- $value = $configInstance->getAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_attr', '');
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_user_attr', $value);
- $configInstance->setAppValue(
- 'user_ldap', $config.'ldap_expert_uuid_group_attr', $value);
- }
-
- if($enableRawMode) {
- $configInstance->setAppValue('user_ldap', $config.'ldap_user_filter_mode', 1);
- $configInstance->setAppValue('user_ldap', $config.'ldap_login_filter_mode', 1);
- $configInstance->setAppValue('user_ldap', $config.'ldap_group_filter_mode', 1);
- }
-}
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 0bfccb08040..8f0916f768f 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.4.5
+0.5.0
diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js
index 6b5cdf33d48..ddbdc482b86 100644
--- a/apps/user_ldap/l10n/ar.js
+++ b/apps/user_ldap/l10n/ar.js
@@ -40,6 +40,7 @@ OC.L10N.register(
"Port" : "المنفذ",
"Password" : "كلمة المرور",
"Back" : "رجوع",
+ "Continue" : "المتابعة",
"Advanced" : "تعديلات متقدمه",
"Email Field" : "خانة البريد الإلكتروني"
},
diff --git a/apps/user_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json
index 4bf07f625d5..178e8f0acd8 100644
--- a/apps/user_ldap/l10n/ar.json
+++ b/apps/user_ldap/l10n/ar.json
@@ -38,6 +38,7 @@
"Port" : "المنفذ",
"Password" : "كلمة المرور",
"Back" : "رجوع",
+ "Continue" : "المتابعة",
"Advanced" : "تعديلات متقدمه",
"Email Field" : "خانة البريد الإلكتروني"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index 545fb9c194f..ba6d9c214f3 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -111,12 +111,12 @@ OC.L10N.register(
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent Feld",
"Quota Default" : "Standard Kontingent",
"in bytes" : "in Bytes",
- "Email Field" : "E-Mail Feld",
+ "Email Field" : "E-Mail-Feld",
"User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
"Internal Username" : "Interner Benutzername",
@@ -128,7 +128,7 @@ OC.L10N.register(
"UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
"Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
- "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
- "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+ "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen",
+ "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index df0f777536a..df4af011afc 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -109,12 +109,12 @@
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent Feld",
"Quota Default" : "Standard Kontingent",
"in bytes" : "in Bytes",
- "Email Field" : "E-Mail Feld",
+ "Email Field" : "E-Mail-Feld",
"User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
"Internal Username" : "Interner Benutzername",
@@ -126,7 +126,7 @@
"UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
"Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
- "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
- "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+ "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen",
+ "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index c89d7793a4a..a007f589ef6 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -37,7 +37,7 @@ OC.L10N.register(
"Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
"Invalid Host" : "Ungültiger Host",
"Server" : "Server",
- "User Filter" : "Nutzer-Filter",
+ "User Filter" : "Benutzer-Filter",
"Login Filter" : "Anmeldefilter",
"Group Filter" : "Gruppen-Filter",
"Save" : "Speichern",
@@ -51,7 +51,7 @@ OC.L10N.register(
"The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
"Test Filter" : "Test-Filter",
"groups found" : "Gruppen gefunden",
- "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+ "Users login with this attribute:" : "Benutzeranmeldung mit diesem Merkmal:",
"LDAP Username:" : "LDAP-Benutzername:",
"LDAP Email Address:" : "LDAP E-Mail-Adresse:",
"Other Attributes:" : "Andere Attribute:",
@@ -111,7 +111,7 @@ OC.L10N.register(
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent-Feld",
"Quota Default" : "Standard-Kontingent",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index 7b047cbcd2f..5fdb285a863 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -35,7 +35,7 @@
"Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
"Invalid Host" : "Ungültiger Host",
"Server" : "Server",
- "User Filter" : "Nutzer-Filter",
+ "User Filter" : "Benutzer-Filter",
"Login Filter" : "Anmeldefilter",
"Group Filter" : "Gruppen-Filter",
"Save" : "Speichern",
@@ -49,7 +49,7 @@
"The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
"Test Filter" : "Test-Filter",
"groups found" : "Gruppen gefunden",
- "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+ "Users login with this attribute:" : "Benutzeranmeldung mit diesem Merkmal:",
"LDAP Username:" : "LDAP-Benutzername:",
"LDAP Email Address:" : "LDAP E-Mail-Adresse:",
"Other Attributes:" : "Andere Attribute:",
@@ -109,7 +109,7 @@
"Nested Groups" : "Eingebundene Gruppen",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
"Paging chunksize" : "Seitenstücke (Paging chunksize)",
- "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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+ "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.)" : "Abschnittslänge von seitenweise angezeigten LDAP-Suchen, die bei Suchen wie etwa Benutzer- und Gruppen-Auflistungen ausufernd viele Ergebnisse liefern können (die Einstellung „0“ deaktiviert seitenweise angezeigte LDAP-Suchen in diesen Situationen).",
"Special Attributes" : "Spezielle Eigenschaften",
"Quota Field" : "Kontingent-Feld",
"Quota Default" : "Standard-Kontingent",
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 520c47a839e..3da1f9be156 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Baieztatu Ezabatzea",
"_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
"_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
"Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
"Invalid Host" : "Baliogabeko hostalaria",
"Server" : "Zerbitzaria",
@@ -47,6 +48,7 @@ OC.L10N.register(
"only from those groups:" : "bakarrik talde hauetakoak:",
"Raw LDAP filter" : "Raw LDAP iragazkia",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP taldek izango duten sarrera %s instantziara:",
+ "Test Filter" : "Frogatu Iragazkia",
"groups found" : "talde aurkituta",
"Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
"LDAP Username:" : "LDAP Erabiltzaile izena:",
@@ -66,12 +68,14 @@ OC.L10N.register(
"For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"One Base DN per line" : "DN Oinarri bat lerroko",
"You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+ "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
"Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
"The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
"users found" : "erabiltzaile aurkituta",
"Saving" : "Gordetzen",
"Back" : "Atzera",
"Continue" : "Jarraitu",
+ "LDAP" : "LDAP",
"Expert" : "Aditua",
"Advanced" : "Aurreratua",
"<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index 67c82070861..1c698593f56 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Baieztatu Ezabatzea",
"_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
"_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
"Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
"Invalid Host" : "Baliogabeko hostalaria",
"Server" : "Zerbitzaria",
@@ -45,6 +46,7 @@
"only from those groups:" : "bakarrik talde hauetakoak:",
"Raw LDAP filter" : "Raw LDAP iragazkia",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP taldek izango duten sarrera %s instantziara:",
+ "Test Filter" : "Frogatu Iragazkia",
"groups found" : "talde aurkituta",
"Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
"LDAP Username:" : "LDAP Erabiltzaile izena:",
@@ -64,12 +66,14 @@
"For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"One Base DN per line" : "DN Oinarri bat lerroko",
"You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+ "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
"Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
"The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
"users found" : "erabiltzaile aurkituta",
"Saving" : "Gordetzen",
"Back" : "Atzera",
"Continue" : "Jarraitu",
+ "LDAP" : "LDAP",
"Expert" : "Aditua",
"Advanced" : "Aurreratua",
"<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 4424ef2bba8..0783dd94af7 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -127,7 +127,7 @@ OC.L10N.register(
"UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :",
"UUID Attribute for Groups:" : "Attribut UUID pour les groupes :",
"Username-LDAP User Mapping" : "Association Nom d'utilisateur-Utilisateur LDAP",
- "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
+ "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaître précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
"Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP",
"Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP"
},
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 5494a072fee..06cc2e9c60e 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -125,7 +125,7 @@
"UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :",
"UUID Attribute for Groups:" : "Attribut UUID pour les groupes :",
"Username-LDAP User Mapping" : "Association Nom d'utilisateur-Utilisateur LDAP",
- "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
+ "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaître précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
"Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP",
"Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index 26ca061c71a..3319f9bea58 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -19,7 +19,7 @@ OC.L10N.register(
"Success" : "Berhasil",
"Error" : "Kesalahan",
"Please specify a Base DN" : "Sialakan menetapkan Base DN",
- "Could not determine Base DN" : "Tidak dapat menetakan Base DN",
+ "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
"Please specify the port" : "Silakan tetapkan port",
"Configuration OK" : "Konfigurasi Oke",
"Configuration incorrect" : "Konfigurasi salah",
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Konfirmasi Penghapusan",
"_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
"_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
"Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
"Invalid Host" : "Host tidak sah",
"Server" : "Server",
@@ -107,6 +108,7 @@ OC.L10N.register(
"User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Internal Username" : "Nama Pengguna Internal",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Secara default, nama pengguna internal akan dibuat dari atribut UUID. Hal ini untuk memastikan bahwa nama pengguna agar unik dan karakter tidak perlu dikonversi. Nama pengguna internal memiliki batasan hanya karakter ini yang diizinkan: [ a-zA-Z0-9_.@- ]. Karakter selain itu akan diganti dengan korespondensi ASCII mereka atau akan dihilangkan. Pada nama yang bentrok, sebuah angka akan ditambahkan dan ditingkatkan. Nama pengguna internal ini digunakan untuk mengenali sebuah nama secara internal. Itu juga dipakai sebagai nama folder home default, serta sebagai bagian dari URL remote untuk semua instansi layanan *DAV. Dengan pengaturan ini, perilaku default dapat diganti. Untuk mewujudkan perilaku seperti sebelum ownCloud 5, masukkan atribut nama tampilan pengguna di bidang isian berikut. Tinggalkan kosong untuk menggunakan perilaku default. Perubahan hanya akan terlihat untuk pengguna LDAP yang baru dipetakan (ditambahkan).",
"Internal Username Attribute:" : "Atribut Nama Pengguna Internal:",
"Override UUID detection" : "Timpa deteksi UUID",
"UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index ad650fc0fb9..c6a7ecd2e95 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -17,7 +17,7 @@
"Success" : "Berhasil",
"Error" : "Kesalahan",
"Please specify a Base DN" : "Sialakan menetapkan Base DN",
- "Could not determine Base DN" : "Tidak dapat menetakan Base DN",
+ "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
"Please specify the port" : "Silakan tetapkan port",
"Configuration OK" : "Konfigurasi Oke",
"Configuration incorrect" : "Konfigurasi salah",
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Konfirmasi Penghapusan",
"_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
"_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
"Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
"Invalid Host" : "Host tidak sah",
"Server" : "Server",
@@ -105,6 +106,7 @@
"User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Internal Username" : "Nama Pengguna Internal",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Secara default, nama pengguna internal akan dibuat dari atribut UUID. Hal ini untuk memastikan bahwa nama pengguna agar unik dan karakter tidak perlu dikonversi. Nama pengguna internal memiliki batasan hanya karakter ini yang diizinkan: [ a-zA-Z0-9_.@- ]. Karakter selain itu akan diganti dengan korespondensi ASCII mereka atau akan dihilangkan. Pada nama yang bentrok, sebuah angka akan ditambahkan dan ditingkatkan. Nama pengguna internal ini digunakan untuk mengenali sebuah nama secara internal. Itu juga dipakai sebagai nama folder home default, serta sebagai bagian dari URL remote untuk semua instansi layanan *DAV. Dengan pengaturan ini, perilaku default dapat diganti. Untuk mewujudkan perilaku seperti sebelum ownCloud 5, masukkan atribut nama tampilan pengguna di bidang isian berikut. Tinggalkan kosong untuk menggunakan perilaku default. Perubahan hanya akan terlihat untuk pengguna LDAP yang baru dipetakan (ditambahkan).",
"Internal Username Attribute:" : "Atribut Nama Pengguna Internal:",
"Override UUID detection" : "Timpa deteksi UUID",
"UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index b139c5b3fb4..0c28cf14ab6 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -39,23 +39,23 @@ OC.L10N.register(
"Server" : "サーバー",
"User Filter" : "ユーザーフィルター",
"Login Filter" : "ログインフィルター",
- "Group Filter" : "グループフィルタ",
+ "Group Filter" : "グループフィルター",
"Save" : "保存",
"Test Configuration" : "設定をテスト",
"Help" : "ヘルプ",
"Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
"only those object classes:" : "それらのオブジェクトクラスのみ:",
"only from those groups:" : "それらのグループからのみ:",
- "Edit raw filter instead" : "フィルタを編集",
- "Raw LDAP filter" : "LDAP フィルタ",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+ "Edit raw filter instead" : "フィルターを編集",
+ "Raw LDAP filter" : "LDAPフィルター",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
"Test Filter" : "フィルターをテスト",
"groups found" : "グループが見つかりました",
"Users login with this attribute:" : "この属性でユーザーログイン:",
"LDAP Username:" : "LDAPユーザー名:",
"LDAP Email Address:" : "LDAPメールアドレス:",
"Other Attributes:" : "他の属性:",
- "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
+ "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
"1. Server" : "1. Server",
"%s. Server:" : "%s. サーバー:",
"Add Server Configuration" : "サーバー設定を追加",
@@ -72,7 +72,7 @@ OC.L10N.register(
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
"Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
"Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" : "ユーザーが見つかりました",
"Saving" : "保存中",
"Back" : "戻る",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index 25ad7f73bd8..036808e1d6b 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -37,23 +37,23 @@
"Server" : "サーバー",
"User Filter" : "ユーザーフィルター",
"Login Filter" : "ログインフィルター",
- "Group Filter" : "グループフィルタ",
+ "Group Filter" : "グループフィルター",
"Save" : "保存",
"Test Configuration" : "設定をテスト",
"Help" : "ヘルプ",
"Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
"only those object classes:" : "それらのオブジェクトクラスのみ:",
"only from those groups:" : "それらのグループからのみ:",
- "Edit raw filter instead" : "フィルタを編集",
- "Raw LDAP filter" : "LDAP フィルタ",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+ "Edit raw filter instead" : "フィルターを編集",
+ "Raw LDAP filter" : "LDAPフィルター",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
"Test Filter" : "フィルターをテスト",
"groups found" : "グループが見つかりました",
"Users login with this attribute:" : "この属性でユーザーログイン:",
"LDAP Username:" : "LDAPユーザー名:",
"LDAP Email Address:" : "LDAPメールアドレス:",
"Other Attributes:" : "他の属性:",
- "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
+ "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
"1. Server" : "1. Server",
"%s. Server:" : "%s. サーバー:",
"Add Server Configuration" : "サーバー設定を追加",
@@ -70,7 +70,7 @@
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
"Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
"Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" : "ユーザーが見つかりました",
"Saving" : "保存中",
"Back" : "戻る",
diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js
index a00fa0f2306..054d7a3494a 100644
--- a/apps/user_ldap/l10n/pl.js
+++ b/apps/user_ldap/l10n/pl.js
@@ -49,6 +49,7 @@ OC.L10N.register(
"Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
"Raw LDAP filter" : "Czysty filtr LDAP",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
+ "Test Filter" : "Testuj filtr",
"groups found" : "grup znaleziono",
"Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
"LDAP Username:" : "Nazwa użytkownika LDAP:",
diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json
index 178d47afbfe..04fd22c0836 100644
--- a/apps/user_ldap/l10n/pl.json
+++ b/apps/user_ldap/l10n/pl.json
@@ -47,6 +47,7 @@
"Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
"Raw LDAP filter" : "Czysty filtr LDAP",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
+ "Test Filter" : "Testuj filtr",
"groups found" : "grup znaleziono",
"Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
"LDAP Username:" : "Nazwa użytkownika LDAP:",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 0f4b3d11bed..46b9e1e0cc5 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Confirmar a operação de apagar",
"_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
"_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
"Could not find the desired feature" : "Não se encontrou a função desejada",
"Invalid Host" : "Hospedeiro Inválido",
"Server" : "Servidor",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 9c753884160..ab690b30216 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Confirmar a operação de apagar",
"_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
"_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
"Could not find the desired feature" : "Não se encontrou a função desejada",
"Invalid Host" : "Hospedeiro Inválido",
"Server" : "Servidor",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index 016ef747a2c..1637d3a24ae 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -3,9 +3,9 @@ OC.L10N.register(
{
"Failed to clear the mappings." : "Не удалось очистить соответствия.",
"Failed to delete the server configuration" : "Не удалось удалить конфигурацию сервера",
- "The configuration is valid and the connection could be established!" : "Конфигурация правильная и подключение может быть установлено!",
- "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация верна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
- "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Проверьте журналы для уточнения деталей.",
+ "The configuration is valid and the connection could be established!" : "Конфигурация корректна и подключение может быть установлено!",
+ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация корректна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
+ "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация некорректна. Проверьте журналы для уточнения деталей.",
"No action specified" : "Действие не указано",
"No configuration specified" : "Конфигурация не создана",
"No data specified" : "Нет данных",
@@ -13,16 +13,16 @@ OC.L10N.register(
"Deletion failed" : "Удаление не удалось",
"Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
"Keep settings?" : "Сохранить настройки?",
- "{nthServer}. Server" : "{nthServer}. Сервер",
- "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера",
- "mappings cleared" : "Соответствия очищены",
+ "{nthServer}. Server" : "Сервер {nthServer}.",
+ "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
+ "mappings cleared" : "соответствия очищены",
"Success" : "Успешно",
"Error" : "Ошибка",
"Please specify a Base DN" : "Необходимо указать Base DN",
"Could not determine Base DN" : "Невозможно определить Base DN",
"Please specify the port" : "Укажите порт",
"Configuration OK" : "Конфигурация в порядке",
- "Configuration incorrect" : "Конфигурация неправильна",
+ "Configuration incorrect" : "Конфигурация некорректна",
"Configuration incomplete" : "Конфигурация не завершена",
"Select groups" : "Выберите группы",
"Select object classes" : "Выберите объектные классы",
@@ -34,45 +34,45 @@ OC.L10N.register(
"_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
"_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.",
- "Could not find the desired feature" : "Не могу найти требуемой функциональности",
- "Invalid Host" : "Неверный сервер",
+ "Could not find the desired feature" : "Не удается найти требуемую функциональность",
+ "Invalid Host" : "Некорректный адрес сервера",
"Server" : "Сервер",
- "User Filter" : "Пользователи",
- "Login Filter" : "Логин",
+ "User Filter" : "Фильтр пользователей",
+ "Login Filter" : "Фильтр логинов",
"Group Filter" : "Фильтр группы",
"Save" : "Сохранить",
"Test Configuration" : "Проверить конфигурацию",
"Help" : "Помощь",
- "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
- "only those object classes:" : "только эти объектные классы",
- "only from those groups:" : "только из этих групп",
+ "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
+ "only those object classes:" : "только эти объектные классы:",
+ "only from those groups:" : "только из этих групп:",
"Edit raw filter instead" : "Редактировать исходный фильтр",
"Raw LDAP filter" : "Исходный LDAP фильтр",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
"Test Filter" : "Проверить фильтр",
"groups found" : "групп найдено",
- "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
+ "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
"LDAP Username:" : "Имя пользователя LDAP",
- "LDAP Email Address:" : "LDAP адрес электронной почты:",
+ "LDAP Email Address:" : "Адрес email LDAP:",
"Other Attributes:" : "Другие атрибуты:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
- "1. Server" : "1. Сервер",
- "%s. Server:" : "%s. Сервер:",
+ "1. Server" : "Сервер 1.",
+ "%s. Server:" : "Сервер %s:",
"Add Server Configuration" : "Добавить конфигурацию сервера",
"Delete Configuration" : "Удалить конфигурацию",
"Host" : "Сервер",
- "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
+ "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
"Port" : "Порт",
"User DN" : "DN пользователя",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
"Password" : "Пароль",
"For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
"One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
- "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
- "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.",
+ "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенные\"",
+ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.",
"Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
- "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
+ "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
"users found" : "пользователей найдено",
"Saving" : "Сохраняется",
"Back" : "Назад",
@@ -81,7 +81,7 @@ OC.L10N.register(
"Expert" : "Эксперт",
"Advanced" : "Дополнительно",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
- "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
+ "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
"Connection Settings" : "Настройки подключения",
"Configuration Active" : "Конфигурация активна",
"When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.",
@@ -89,38 +89,38 @@ OC.L10N.register(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
"Backup (Replica) Port" : "Порт резервного сервера",
"Disable Main Server" : "Отключить главный сервер",
- "Only connect to the replica server." : "Подключаться только к серверу-реплике.",
+ "Only connect to the replica server." : "Подключаться только к резервному серверу",
"Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
"Turn off SSL certificate validation." : "Отключить проверку сертификата 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." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
- "Cache Time-To-Live" : "Кэш времени жизни",
+ "Cache Time-To-Live" : "Кэш времени жизни (TTL)",
"in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.",
"Directory Settings" : "Настройки каталога",
"User Display Name Field" : "Поле отображаемого имени пользователя",
"The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
- "Base User Tree" : "База пользовательского дерева",
+ "Base User Tree" : "База дерева пользователей",
"One User Base DN per line" : "По одной базовому DN пользователей в строке.",
"User Search Attributes" : "Атрибуты поиска пользоватетелей",
"Optional; one attribute per line" : "Опционально; один атрибут в строке",
"Group Display Name Field" : "Поле отображаемого имени группы",
"The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
- "Base Group Tree" : "База группового дерева",
+ "Base Group Tree" : "База дерева групп",
"One Group Base DN per line" : "По одной базовому DN групп в строке.",
- "Group Search Attributes" : "Атрибуты поиска для группы",
+ "Group Search Attributes" : "Атрибуты поиска групп",
"Group-Member association" : "Ассоциация Группа-Участник",
"Nested Groups" : "Вложенные группы",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
- "Paging chunksize" : "Постраничный chunksize",
- "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
+ "Paging chunksize" : "Страничный размер блоков",
+ "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Установка значения в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
"Special Attributes" : "Специальные атрибуты",
"Quota Field" : "Поле квоты",
"Quota Default" : "Квота по умолчанию",
"in bytes" : "в байтах",
- "Email Field" : "Поле адреса электронной почты",
+ "Email Field" : "Поле адреса email",
"User Home Folder Naming Rule" : "Правило именования домашнего каталога пользователя",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
"Internal Username" : "Внутреннее имя пользователя",
- "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы заменяются аналогами из таблицы ASCII или же просто пропускаются. В случае конфликта к имени будет добавлено/увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
"Internal Username Attribute:" : "Атрибут для внутреннего имени:",
"Override UUID detection" : "Переопределить нахождение UUID",
"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index e20baa90401..5cfde269ec1 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -1,9 +1,9 @@
{ "translations": {
"Failed to clear the mappings." : "Не удалось очистить соответствия.",
"Failed to delete the server configuration" : "Не удалось удалить конфигурацию сервера",
- "The configuration is valid and the connection could be established!" : "Конфигурация правильная и подключение может быть установлено!",
- "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация верна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
- "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Проверьте журналы для уточнения деталей.",
+ "The configuration is valid and the connection could be established!" : "Конфигурация корректна и подключение может быть установлено!",
+ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурация корректна, но операция подключения завершилась неудачно. Проверьте настройки сервера и учетные данные.",
+ "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация некорректна. Проверьте журналы для уточнения деталей.",
"No action specified" : "Действие не указано",
"No configuration specified" : "Конфигурация не создана",
"No data specified" : "Нет данных",
@@ -11,16 +11,16 @@
"Deletion failed" : "Удаление не удалось",
"Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
"Keep settings?" : "Сохранить настройки?",
- "{nthServer}. Server" : "{nthServer}. Сервер",
- "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера",
- "mappings cleared" : "Соответствия очищены",
+ "{nthServer}. Server" : "Сервер {nthServer}.",
+ "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
+ "mappings cleared" : "соответствия очищены",
"Success" : "Успешно",
"Error" : "Ошибка",
"Please specify a Base DN" : "Необходимо указать Base DN",
"Could not determine Base DN" : "Невозможно определить Base DN",
"Please specify the port" : "Укажите порт",
"Configuration OK" : "Конфигурация в порядке",
- "Configuration incorrect" : "Конфигурация неправильна",
+ "Configuration incorrect" : "Конфигурация некорректна",
"Configuration incomplete" : "Конфигурация не завершена",
"Select groups" : "Выберите группы",
"Select object classes" : "Выберите объектные классы",
@@ -32,45 +32,45 @@
"_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
"_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.",
- "Could not find the desired feature" : "Не могу найти требуемой функциональности",
- "Invalid Host" : "Неверный сервер",
+ "Could not find the desired feature" : "Не удается найти требуемую функциональность",
+ "Invalid Host" : "Некорректный адрес сервера",
"Server" : "Сервер",
- "User Filter" : "Пользователи",
- "Login Filter" : "Логин",
+ "User Filter" : "Фильтр пользователей",
+ "Login Filter" : "Фильтр логинов",
"Group Filter" : "Фильтр группы",
"Save" : "Сохранить",
"Test Configuration" : "Проверить конфигурацию",
"Help" : "Помощь",
- "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
- "only those object classes:" : "только эти объектные классы",
- "only from those groups:" : "только из этих групп",
+ "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
+ "only those object classes:" : "только эти объектные классы:",
+ "only from those groups:" : "только из этих групп:",
"Edit raw filter instead" : "Редактировать исходный фильтр",
"Raw LDAP filter" : "Исходный LDAP фильтр",
- "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+ "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
"Test Filter" : "Проверить фильтр",
"groups found" : "групп найдено",
- "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
+ "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
"LDAP Username:" : "Имя пользователя LDAP",
- "LDAP Email Address:" : "LDAP адрес электронной почты:",
+ "LDAP Email Address:" : "Адрес email LDAP:",
"Other Attributes:" : "Другие атрибуты:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
- "1. Server" : "1. Сервер",
- "%s. Server:" : "%s. Сервер:",
+ "1. Server" : "Сервер 1.",
+ "%s. Server:" : "Сервер %s:",
"Add Server Configuration" : "Добавить конфигурацию сервера",
"Delete Configuration" : "Удалить конфигурацию",
"Host" : "Сервер",
- "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
+ "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
"Port" : "Порт",
"User DN" : "DN пользователя",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
"Password" : "Пароль",
"For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
"One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
- "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
- "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.",
+ "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенные\"",
+ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.",
"Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
- "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
- "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
+ "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
+ "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
"users found" : "пользователей найдено",
"Saving" : "Сохраняется",
"Back" : "Назад",
@@ -79,7 +79,7 @@
"Expert" : "Эксперт",
"Advanced" : "Дополнительно",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
- "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
+ "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
"Connection Settings" : "Настройки подключения",
"Configuration Active" : "Конфигурация активна",
"When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.",
@@ -87,38 +87,38 @@
"Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
"Backup (Replica) Port" : "Порт резервного сервера",
"Disable Main Server" : "Отключить главный сервер",
- "Only connect to the replica server." : "Подключаться только к серверу-реплике.",
+ "Only connect to the replica server." : "Подключаться только к резервному серверу",
"Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
"Turn off SSL certificate validation." : "Отключить проверку сертификата 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." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
- "Cache Time-To-Live" : "Кэш времени жизни",
+ "Cache Time-To-Live" : "Кэш времени жизни (TTL)",
"in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.",
"Directory Settings" : "Настройки каталога",
"User Display Name Field" : "Поле отображаемого имени пользователя",
"The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
- "Base User Tree" : "База пользовательского дерева",
+ "Base User Tree" : "База дерева пользователей",
"One User Base DN per line" : "По одной базовому DN пользователей в строке.",
"User Search Attributes" : "Атрибуты поиска пользоватетелей",
"Optional; one attribute per line" : "Опционально; один атрибут в строке",
"Group Display Name Field" : "Поле отображаемого имени группы",
"The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
- "Base Group Tree" : "База группового дерева",
+ "Base Group Tree" : "База дерева групп",
"One Group Base DN per line" : "По одной базовому DN групп в строке.",
- "Group Search Attributes" : "Атрибуты поиска для группы",
+ "Group Search Attributes" : "Атрибуты поиска групп",
"Group-Member association" : "Ассоциация Группа-Участник",
"Nested Groups" : "Вложенные группы",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
- "Paging chunksize" : "Постраничный chunksize",
- "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
+ "Paging chunksize" : "Страничный размер блоков",
+ "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.)" : "ChunkSize используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Установка значения в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
"Special Attributes" : "Специальные атрибуты",
"Quota Field" : "Поле квоты",
"Quota Default" : "Квота по умолчанию",
"in bytes" : "в байтах",
- "Email Field" : "Поле адреса электронной почты",
+ "Email Field" : "Поле адреса email",
"User Home Folder Naming Rule" : "Правило именования домашнего каталога пользователя",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
"Internal Username" : "Внутреннее имя пользователя",
- "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+ "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы заменяются аналогами из таблицы ASCII или же просто пропускаются. В случае конфликта к имени будет добавлено/увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для каталога пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
"Internal Username Attribute:" : "Атрибут для внутреннего имени:",
"Override UUID detection" : "Переопределить нахождение UUID",
"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js
index 3c3f9a0cc83..79ff7d3a715 100644
--- a/apps/user_ldap/l10n/sk_SK.js
+++ b/apps/user_ldap/l10n/sk_SK.js
@@ -33,6 +33,7 @@ OC.L10N.register(
"Confirm Deletion" : "Potvrdiť vymazanie",
"_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
"_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.",
"Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
"Invalid Host" : "Neplatný hostiteľ",
"Server" : "Server",
diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json
index ff881a68803..17d511b2ea9 100644
--- a/apps/user_ldap/l10n/sk_SK.json
+++ b/apps/user_ldap/l10n/sk_SK.json
@@ -31,6 +31,7 @@
"Confirm Deletion" : "Potvrdiť vymazanie",
"_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
"_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.",
"Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
"Invalid Host" : "Neplatný hostiteľ",
"Server" : "Server",
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index a9d21ffc8e7..e3b2616e2d2 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -592,7 +592,7 @@ class Connection extends LDAPUtility {
if(!$ldapLogin) {
\OCP\Util::writeLog('user_ldap',
'Bind failed: ' . $this->ldap->errno($cr) . ': ' . $this->ldap->error($cr),
- \OCP\Util::ERROR);
+ \OCP\Util::WARN);
$this->ldapConnectionRes = null;
return false;
}
diff --git a/apps/user_webdavauth/l10n/da.js b/apps/user_webdavauth/l10n/da.js
index 9fc6a4e161f..f545d82413b 100644
--- a/apps/user_webdavauth/l10n/da.js
+++ b/apps/user_webdavauth/l10n/da.js
@@ -4,6 +4,6 @@ OC.L10N.register(
"WebDAV Authentication" : "WebDAV-godkendelse",
"Address:" : "Adresse:",
"Save" : "Gem",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
+ "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/da.json b/apps/user_webdavauth/l10n/da.json
index 9e967eb3158..c0e7a709b57 100644
--- a/apps/user_webdavauth/l10n/da.json
+++ b/apps/user_webdavauth/l10n/da.json
@@ -2,6 +2,6 @@
"WebDAV Authentication" : "WebDAV-godkendelse",
"Address:" : "Adresse:",
"Save" : "Gem",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
+ "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fr.js b/apps/user_webdavauth/l10n/fr.js
index a53302d4a6d..5a89cf211ef 100644
--- a/apps/user_webdavauth/l10n/fr.js
+++ b/apps/user_webdavauth/l10n/fr.js
@@ -4,6 +4,6 @@ OC.L10N.register(
"WebDAV Authentication" : "Authentification WebDAV",
"Address:" : "Adresse :",
"Save" : "Sauvegarder",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification non valable et toute autre valeur comme une authentification valable."
+ "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide."
},
"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/fr.json b/apps/user_webdavauth/l10n/fr.json
index 93d631c8ed6..72336cad0b2 100644
--- a/apps/user_webdavauth/l10n/fr.json
+++ b/apps/user_webdavauth/l10n/fr.json
@@ -2,6 +2,6 @@
"WebDAV Authentication" : "Authentification WebDAV",
"Address:" : "Adresse :",
"Save" : "Sauvegarder",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification non valable et toute autre valeur comme une authentification valable."
+ "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide."
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/config/.htaccess b/config/.htaccess
index 2421e9a1631..c7a7b79feac 100644
--- a/config/.htaccess
+++ b/config/.htaccess
@@ -1,10 +1,10 @@
# line below if for Apache 2.4
-<ifModule mod_authz_core>
+<ifModule mod_authz_core.c>
Require all denied
</ifModule>
# line below if for Apache 2.2
-<ifModule !mod_authz_core>
+<ifModule !mod_authz_core.c>
deny from all
</ifModule>
diff --git a/core/command/app/disable.php b/core/command/app/disable.php
index dcdee92349e..2e028d183bb 100644
--- a/core/command/app/disable.php
+++ b/core/command/app/disable.php
@@ -28,8 +28,12 @@ class Disable extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
$appId = $input->getArgument('app-id');
if (\OC_App::isEnabled($appId)) {
- \OC_App::disable($appId);
- $output->writeln($appId . ' disabled');
+ try {
+ \OC_App::disable($appId);
+ $output->writeln($appId . ' disabled');
+ } catch(\Exception $e) {
+ $output->writeln($e->getMessage());
+ }
} else {
$output->writeln('No such app enabled: ' . $appId);
}
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 9d03b705d12..a2fdab99ba3 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -282,17 +282,19 @@ class ConvertType extends Command {
protected function saveDBInfo(InputInterface $input) {
$type = $input->getArgument('type');
$username = $input->getArgument('username');
- $dbhost = $input->getArgument('hostname');
- $dbname = $input->getArgument('database');
+ $dbHost = $input->getArgument('hostname');
+ $dbName = $input->getArgument('database');
$password = $input->getOption('password');
if ($input->getOption('port')) {
- $dbhost .= ':'.$input->getOption('port');
+ $dbHost .= ':'.$input->getOption('port');
}
- $this->config->setSystemValue('dbtype', $type);
- $this->config->setSystemValue('dbname', $dbname);
- $this->config->setSystemValue('dbhost', $dbhost);
- $this->config->setSystemValue('dbuser', $username);
- $this->config->setSystemValue('dbpassword', $password);
+ $this->config->setSystemValues([
+ 'dbtype' => $type,
+ 'dbname' => $dbName,
+ 'dbhost' => $dbHost,
+ 'dbuser' => $username,
+ 'dbpassword' => $password,
+ ]);
}
}
diff --git a/core/js/share.js b/core/js/share.js
index 877ef4856a3..b3533af4824 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -203,6 +203,9 @@ OC.Share={
tooltip += '@' + userDomain;
}
if (server) {
+ if (!userDomain) {
+ userDomain = '…';
+ }
tooltip += '@' + server;
}
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index f4500895464..7eb22261e10 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -702,17 +702,17 @@ describe('OC.Share tests', function() {
it('displays the user name part of a remote share owner', function() {
checkOwner(
'User One@someserver.com',
- 'User One',
+ 'User One@…',
'User One@someserver.com'
);
checkOwner(
'User One@someserver.com/',
- 'User One',
+ 'User One@…',
'User One@someserver.com'
);
checkOwner(
'User One@someserver.com/root/of/owncloud',
- 'User One',
+ 'User One@…',
'User One@someserver.com'
);
});
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 5e6574411ab..d867d021893 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -2,6 +2,7 @@ OC.L10N.register(
"core",
{
"Updated database" : "قاعدة بيانات المرفوعات",
+ "No image or file provided" : "لم يتم توفير صورة أو ملف",
"Unknown filetype" : "نوع الملف غير معروف",
"Invalid image" : "الصورة غير صالحة",
"Sunday" : "الأحد",
@@ -25,12 +26,21 @@ OC.L10N.register(
"December" : "كانون الاول",
"Settings" : "إعدادات",
"Saving..." : "جاري الحفظ...",
+ "I know what I'm doing" : "أعرف ماذا أفعل",
+ "Password can not be changed. Please contact your administrator." : "كلمة المرور لا يمكن تغييرها. فضلاً تحدث مع المسؤول",
"No" : "لا",
"Yes" : "نعم",
"Choose" : "اختيار",
"Ok" : "موافق",
+ "read-only" : "قراءة فقط",
"_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
+ "New Files" : "ملفات جديدة",
+ "Already existing files" : "المفات موجودة مسبقاً",
+ "Which files do you want to keep?" : "ماهي الملفات التي ترغب في إبقاءها ؟",
+ "If you select both versions, the copied file will have a number added to its name." : "عند إختيار كلا النسختين. المف المنسوخ سيحتوي على رقم في إسمه.",
"Cancel" : "الغاء",
+ "Continue" : "المتابعة",
+ "(all selected)" : "(إختيار الكل)",
"Very weak password" : "كلمة السر ضعيفة جدا",
"Weak password" : "كلمة السر ضعيفة",
"Good password" : "كلمة السر جيدة",
@@ -46,21 +56,30 @@ OC.L10N.register(
"Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
"Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
"Shared with you by {owner}" : "شورك معك من قبل {owner}",
+ "Share with user or group …" : "المشاركة مع مستخدم أو مجموعة...",
"Share link" : "شارك الرابط",
+ "Link" : "الرابط",
"Password protect" : "حماية كلمة السر",
"Password" : "كلمة المرور",
+ "Choose a password for the public link" : "اختر كلمة مرور للرابط العام",
+ "Allow editing" : "السماح بالتعديلات",
"Email link to person" : "ارسل الرابط بالبريد الى صديق",
"Send" : "أرسل",
"Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+ "Expiration" : "إنتهاء",
"Expiration date" : "تاريخ إنتهاء الصلاحية",
+ "Adding user..." : "إضافة مستخدم",
"group" : "مجموعة",
+ "remote" : "عن بعد",
"Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
"Shared in {item} with {user}" : "شورك في {item} مع {user}",
"Unshare" : "إلغاء مشاركة",
+ "notify by email" : "الإشعار عن طريق البريد",
"can share" : "يمكن المشاركة",
"can edit" : "التحرير مسموح",
"access control" : "ضبط الوصول",
"create" : "إنشاء",
+ "change" : "تغيير",
"delete" : "حذف",
"Password protected" : "محمي بكلمة السر",
"Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
@@ -69,6 +88,7 @@ OC.L10N.register(
"Email sent" : "تم ارسال البريد الالكتروني",
"Warning" : "تحذير",
"The object type is not specified." : "نوع العنصر غير محدد.",
+ "Enter new" : "إدخال جديد",
"Delete" : "إلغاء",
"Add" : "اضف",
"_download %n file_::_download %n files_" : ["","","","","",""],
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index aec68dcb55b..7e066b32771 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -1,5 +1,6 @@
{ "translations": {
"Updated database" : "قاعدة بيانات المرفوعات",
+ "No image or file provided" : "لم يتم توفير صورة أو ملف",
"Unknown filetype" : "نوع الملف غير معروف",
"Invalid image" : "الصورة غير صالحة",
"Sunday" : "الأحد",
@@ -23,12 +24,21 @@
"December" : "كانون الاول",
"Settings" : "إعدادات",
"Saving..." : "جاري الحفظ...",
+ "I know what I'm doing" : "أعرف ماذا أفعل",
+ "Password can not be changed. Please contact your administrator." : "كلمة المرور لا يمكن تغييرها. فضلاً تحدث مع المسؤول",
"No" : "لا",
"Yes" : "نعم",
"Choose" : "اختيار",
"Ok" : "موافق",
+ "read-only" : "قراءة فقط",
"_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
+ "New Files" : "ملفات جديدة",
+ "Already existing files" : "المفات موجودة مسبقاً",
+ "Which files do you want to keep?" : "ماهي الملفات التي ترغب في إبقاءها ؟",
+ "If you select both versions, the copied file will have a number added to its name." : "عند إختيار كلا النسختين. المف المنسوخ سيحتوي على رقم في إسمه.",
"Cancel" : "الغاء",
+ "Continue" : "المتابعة",
+ "(all selected)" : "(إختيار الكل)",
"Very weak password" : "كلمة السر ضعيفة جدا",
"Weak password" : "كلمة السر ضعيفة",
"Good password" : "كلمة السر جيدة",
@@ -44,21 +54,30 @@
"Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
"Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
"Shared with you by {owner}" : "شورك معك من قبل {owner}",
+ "Share with user or group …" : "المشاركة مع مستخدم أو مجموعة...",
"Share link" : "شارك الرابط",
+ "Link" : "الرابط",
"Password protect" : "حماية كلمة السر",
"Password" : "كلمة المرور",
+ "Choose a password for the public link" : "اختر كلمة مرور للرابط العام",
+ "Allow editing" : "السماح بالتعديلات",
"Email link to person" : "ارسل الرابط بالبريد الى صديق",
"Send" : "أرسل",
"Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+ "Expiration" : "إنتهاء",
"Expiration date" : "تاريخ إنتهاء الصلاحية",
+ "Adding user..." : "إضافة مستخدم",
"group" : "مجموعة",
+ "remote" : "عن بعد",
"Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
"Shared in {item} with {user}" : "شورك في {item} مع {user}",
"Unshare" : "إلغاء مشاركة",
+ "notify by email" : "الإشعار عن طريق البريد",
"can share" : "يمكن المشاركة",
"can edit" : "التحرير مسموح",
"access control" : "ضبط الوصول",
"create" : "إنشاء",
+ "change" : "تغيير",
"delete" : "حذف",
"Password protected" : "محمي بكلمة السر",
"Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
@@ -67,6 +86,7 @@
"Email sent" : "تم ارسال البريد الالكتروني",
"Warning" : "تحذير",
"The object type is not specified." : "نوع العنصر غير محدد.",
+ "Enter new" : "إدخال جديد",
"Delete" : "إلغاء",
"Add" : "اضف",
"_download %n file_::_download %n files_" : ["","","","","",""],
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index aeea3b0e547..87b4b80d543 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -155,7 +155,6 @@ OC.L10N.register(
"Database name" : "Nome de la base de datos",
"Database tablespace" : "Espaciu de tables de la base de datos",
"Database host" : "Agospiador de la base de datos",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
"Finish setup" : "Finar la configuración ",
"Finishing …" : "Finando ...",
"%s is available. Get more information on how to update." : "Ta disponible %s. Consigui más información en cómo anovar·",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 8374c891fd6..f464e6f11bb 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -153,7 +153,6 @@
"Database name" : "Nome de la base de datos",
"Database tablespace" : "Espaciu de tables de la base de datos",
"Database host" : "Agospiador de la base de datos",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
"Finish setup" : "Finar la configuración ",
"Finishing …" : "Finando ...",
"%s is available. Get more information on how to update." : "Ta disponible %s. Consigui más información en cómo anovar·",
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index 039ece19d97..d31f0e1e8d9 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -2,18 +2,18 @@ OC.L10N.register(
"core",
{
"Couldn't send mail to following users: %s " : "Неуспешно изпращане на имейл до следните потребители: %s.",
- "Turned on maintenance mode" : "Режим за поддръжка включен.",
- "Turned off maintenance mode" : "Режим за поддръжка изключен.",
- "Updated database" : "Базата данни обоновена.",
- "Checked database schema update" : "Промяна на схемата на базата данни проверена.",
- "Checked database schema update for apps" : "Промяна на схемата на базата данни за приложения проверена.",
+ "Turned on maintenance mode" : "Режим за поддръжка е включен",
+ "Turned off maintenance mode" : "Режим за поддръжка е изключен",
+ "Updated database" : "Базата данни е обоновена",
+ "Checked database schema update" : "Обновяването на схемата на базата данни е проверено",
+ "Checked database schema update for apps" : "Обновяването на схемата на базата данни за приложения е проверено",
"Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
"Disabled incompatible apps: %s" : "Изключени са несъвместимите програми: %s.",
- "No image or file provided" : "Нито Изображение, нито файл бяха зададени.",
- "Unknown filetype" : "Непознат тип файл.",
- "Invalid image" : "Невалидно изображение.",
- "No temporary profile picture available, try again" : "Липсва временен аватар, опитай отново.",
- "No crop data provided" : "Липсва информация за клъцването.",
+ "No image or file provided" : "Не бяха доставени картинка или файл",
+ "Unknown filetype" : "Непознат файлов тип",
+ "Invalid image" : "Невалидно изображение",
+ "No temporary profile picture available, try again" : "Не е налична временна профилна снимка, опитайте отново",
+ "No crop data provided" : "Липсват данни за изрязването",
"Sunday" : "Неделя",
"Monday" : "Понеделник",
"Tuesday" : "Вторник",
@@ -34,35 +34,36 @@ OC.L10N.register(
"November" : "Ноември",
"December" : "Декември",
"Settings" : "Настройки",
- "Saving..." : "Записване...",
- "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" : "Знам какво правя!",
- "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
+ "Saving..." : "Запазване...",
+ "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." : "Връзката за възстановяване на паролата беше изпратена до вашата електронна поща. Ако не я получите в разумен период от време, проверете папките си за спам и junk.<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" : "Знам какво правя",
+ "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържете се с администратора.",
"No" : "Не",
"Yes" : "Да",
- "Choose" : "Избери",
+ "Choose" : "Избиране",
"Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
"Ok" : "Добре",
"Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+ "read-only" : "Само за четене",
"_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов проблем","{count} файлови проблема"],
- "One file conflict" : "Един файлов проблем",
+ "One file conflict" : "Един файлов конфликт",
"New Files" : "Нови файлове",
"Already existing files" : "Вече съществуващи файлове",
- "Which files do you want to keep?" : "Кои файлове желаеш да запазиш?",
- "If you select both versions, the copied file will have a number added to its name." : "Ако избереш и двете версии, към името на копирания файл ще бъде добавено число.",
+ "Which files do you want to keep?" : "Кои файлове желете да запазите?",
+ "If you select both versions, the copied file will have a number added to its name." : "Ако изберете и двете версии, към името на копирания файл ще бъде добавено число.",
"Cancel" : "Отказ",
- "Continue" : "Продължи",
+ "Continue" : "Продължаване",
"(all selected)" : "(всички избрани)",
"({count} selected)" : "({count} избрани)",
- "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуваш файл.",
+ "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуващ файл.",
"Very weak password" : "Много слаба парола",
"Weak password" : "Слаба парола",
"So-so password" : "Не особено добра парола",
"Good password" : "Добра парола",
"Strong password" : "Сигурна парола",
- "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
+ "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web сървърът Ви все още не е правилно настроен, за да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
"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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
"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." : "Твоята директория за данни и файлове вероятно са достъпни от интернет. .htaccess файла не функционира. Силно препоръчваме да настроиш уебсъръра по такъв начин, че директорията за данни да не бъде достъпна или да я преместиш извън директорията корен на сървъра.",
"Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
@@ -70,42 +71,46 @@ OC.L10N.register(
"Shared with {recipients}" : "Споделено с {recipients}.",
"Share" : "Споделяне",
"Error" : "Грешка",
- "Error while sharing" : "Грешка при споделянето.",
- "Error while unsharing" : "Грешка докато се премахва споделянето.",
- "Error while changing permissions" : "Грешка при промяна на достъпа.",
+ "Error while sharing" : "Грешка при споделяне",
+ "Error while unsharing" : "Грешка при премахване на споделянето",
+ "Error while changing permissions" : "Грешка при промяна на привилегиите",
"Shared with you and the group {group} by {owner}" : "Споделено с теб и група {group} от {owner}.",
"Shared with you by {owner}" : "Споделено с теб от {owner}.",
"Share with user or group …" : "Сподели с потребител или група...",
"Share link" : "Връзка за споделяне",
"The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
+ "Link" : "Връзка",
"Password protect" : "Защитено с парола",
"Password" : "Парола",
"Choose a password for the public link" : "Избери парола за общодостъпната връзка",
- "Email link to person" : "Изпрати връзка до нечия пощата",
- "Send" : "Изпрати",
- "Set expiration date" : "Посочи дата на изтичане",
+ "Allow editing" : "Позволяване на редактиране",
+ "Email link to person" : "Имейл връзка към човек",
+ "Send" : "Изпращане",
+ "Set expiration date" : "Задаване на дата на изтичане",
"Expiration" : "Изтичане",
"Expiration date" : "Дата на изтичане",
"Adding user..." : "Добавяне на потребител...",
"group" : "група",
+ "remote" : "отдалечен",
"Resharing is not allowed" : "Повторно споделяне не е разрешено.",
"Shared in {item} with {user}" : "Споделено в {item} с {user}.",
- "Unshare" : "Премахни споделяне",
- "notify by email" : "уведоми по имейла",
+ "Unshare" : "Премахване на споделяне",
+ "notify by email" : "уведомяване по електронна поща",
"can share" : "може да споделя",
"can edit" : "може да променя",
"access control" : "контрол на достъпа",
- "create" : "Създаване",
- "delete" : "изтрий",
+ "create" : "създаване",
+ "change" : "промяна",
+ "delete" : "изтриване",
"Password protected" : "Защитено с парола",
"Error unsetting expiration date" : "Грешка при премахване на дата за изтичане",
"Error setting expiration date" : "Грешка при поставяне на дата за изтичане",
"Sending ..." : "Изпращане ...",
- "Email sent" : "Имейла е изпратен",
+ "Email sent" : "Електронната поща е изпратена",
"Warning" : "Предупреждение",
"The object type is not specified." : "Видът на обекта не е избран.",
- "Enter new" : "Въведи нов",
- "Delete" : "Изтрий",
+ "Enter new" : "Въвеждане на нов",
+ "Delete" : "Изтриване",
"Add" : "Добавяне",
"Edit tags" : "Промяна на етикетите",
"Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
@@ -114,9 +119,11 @@ OC.L10N.register(
"Hello world!" : "Здравей Свят!",
"sunny" : "слънчево",
"Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}",
+ "Hello {name}" : "Здравейте, {name}",
"_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
"Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
"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." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, увери се, че потребителското име е правилно.",
@@ -125,48 +132,54 @@ OC.L10N.register(
"Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
"New password" : "Нова парола",
"New Password" : "Нова Парола",
- "Reset password" : "Възстановяване на парола",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
- "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
- "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
+ "Reset password" : "Възстановяване на паролата",
+ "Searching other places" : "Търсене в други места",
+ "No search result in other places" : "Няма резултати от търсене в други места",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} резултат от търсене в други места","{count} резултати от търсене в други места"],
+ "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвайте го на свой собствен риск!",
+ "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля, помисли дали не бихте желали да използваште GNU/Linux сървър.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Изглежда тази %s инсталация работи в 32-битова PHP среда и open_basedir е бил конфигуриран в php.ini. Това ще доведе до проблеми с файлове по-големи от 4GB и е крайно не-препоръчително.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Моля, премахтене настройката за open_basedir от вашия php.ini или преминете към 64-битов PHP.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Изглежда тази %s инсталация работи в 32-битова PHP среда и cURL не е инсталиран. Това ще доведе до проблеми с файлове по-големи от 4GB и е крайно не-препоръчително.",
+ "Please install the cURL extension and restart your webserver." : "Моля инсталирайте cURL разширението и рестартирайте вашия мрежови сървър.",
"Personal" : "Лични",
"Users" : "Потребители",
"Apps" : "Приложения",
"Admin" : "Админ",
"Help" : "Помощ",
- "Error loading tags" : "Грешка при зареждане на етикети.",
- "Tag already exists" : "Етикетите вече съществуват.",
+ "Error loading tags" : "Грешка при зареждане на етикети",
+ "Tag already exists" : "Етикетите вече съществуват",
"Error deleting tag(s)" : "Грешка при изтриване на етикет(и).",
"Error tagging" : "Грешка при задаване на етикета.",
"Error untagging" : "Грешка при премахване на етикета.",
- "Error favoriting" : "Грешка при отбелязване за любим.",
- "Error unfavoriting" : "Грешка при премахване отбелязването за любим.",
+ "Error favoriting" : "Грешка при отбелязване в любими.",
+ "Error unfavoriting" : "Грешка при премахване отбелязването в любими.",
"Access forbidden" : "Достъпът е забранен",
- "File not found" : "Файлът не е открит.",
- "The specified document has not been found on the server." : "Избраният документ не е намерн на сървъра.",
- "You can click here to return to %s." : "Можеш да натиснеш тук, за да се върнеш на %s",
+ "File not found" : "Файлът не е открит",
+ "The specified document has not been found on the server." : "Избраният документ не е намерен на сървъра.",
+ "You can click here to return to %s." : "Можете да натиснете тук, за да се върнете на %s",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n",
"The share will expire on %s." : "Споделянето ще изтече на %s.",
"Cheers!" : "Поздрави!",
"Internal Server Error" : "Вътрешна системна грешка",
"The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
- "More details can be found in the server log." : "Допълнителна информация може да бъде открита в сървърните доклади.",
- "Technical details" : "Техническа информация",
- "Remote Address: %s" : "Remote Address: %s",
- "Request ID: %s" : "Request ID: %s",
- "Code: %s" : "Code: %s",
- "Message: %s" : "Message: %s",
+ "More details can be found in the server log." : "Повече детайли могат да бъдат намерени в сървърния журнал.",
+ "Technical details" : "Технически подробности",
+ "Remote Address: %s" : "Отдалечен адрес: %s",
+ "Request ID: %s" : "ID на заявка: %s",
+ "Code: %s" : "Код: %s",
+ "Message: %s" : "Съобщение: %s",
"File: %s" : "File: %s",
"Line: %s" : "Line: %s",
"Trace" : "Trace",
- "Security Warning" : "Предупреждение за Сигурноста",
+ "Security Warning" : "Предупреждение за сигурноста",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Твоята PHP версия е податлива на NULL Byte атака (CVE-2006-7243).",
"Please update your PHP installation to use %s securely." : "Моля, обнови своята PHP инсталация, за да използваш %s сигурно.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
- "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
- "Username" : "Потребител",
+ "Create an <strong>admin account</strong>" : "Създаване на <strong>администраторски профил</strong>.",
+ "Username" : "Потребителско име",
"Storage & database" : "Дисково пространство и база данни",
"Data folder" : "Директория за данни",
"Configure the database" : "Конфигуриране на базата данни",
@@ -174,9 +187,8 @@ OC.L10N.register(
"Database user" : "Потребител за базата данни",
"Database password" : "Парола за базата данни",
"Database name" : "Име на базата данни",
- "Database tablespace" : "Tablespace-а за базата данни",
+ "Database tablespace" : "Tablespace на базата данни",
"Database host" : "Хост за базата данни",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
"Finish setup" : "Завършване на настройките",
"Finishing …" : "Завършване...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 705ca6f3851..82ff872d6d7 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -1,17 +1,17 @@
{ "translations": {
"Couldn't send mail to following users: %s " : "Неуспешно изпращане на имейл до следните потребители: %s.",
- "Turned on maintenance mode" : "Режим за поддръжка включен.",
- "Turned off maintenance mode" : "Режим за поддръжка изключен.",
- "Updated database" : "Базата данни обоновена.",
- "Checked database schema update" : "Промяна на схемата на базата данни проверена.",
- "Checked database schema update for apps" : "Промяна на схемата на базата данни за приложения проверена.",
+ "Turned on maintenance mode" : "Режим за поддръжка е включен",
+ "Turned off maintenance mode" : "Режим за поддръжка е изключен",
+ "Updated database" : "Базата данни е обоновена",
+ "Checked database schema update" : "Обновяването на схемата на базата данни е проверено",
+ "Checked database schema update for apps" : "Обновяването на схемата на базата данни за приложения е проверено",
"Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
"Disabled incompatible apps: %s" : "Изключени са несъвместимите програми: %s.",
- "No image or file provided" : "Нито Изображение, нито файл бяха зададени.",
- "Unknown filetype" : "Непознат тип файл.",
- "Invalid image" : "Невалидно изображение.",
- "No temporary profile picture available, try again" : "Липсва временен аватар, опитай отново.",
- "No crop data provided" : "Липсва информация за клъцването.",
+ "No image or file provided" : "Не бяха доставени картинка или файл",
+ "Unknown filetype" : "Непознат файлов тип",
+ "Invalid image" : "Невалидно изображение",
+ "No temporary profile picture available, try again" : "Не е налична временна профилна снимка, опитайте отново",
+ "No crop data provided" : "Липсват данни за изрязването",
"Sunday" : "Неделя",
"Monday" : "Понеделник",
"Tuesday" : "Вторник",
@@ -32,35 +32,36 @@
"November" : "Ноември",
"December" : "Декември",
"Settings" : "Настройки",
- "Saving..." : "Записване...",
- "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" : "Знам какво правя!",
- "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
+ "Saving..." : "Запазване...",
+ "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." : "Връзката за възстановяване на паролата беше изпратена до вашата електронна поща. Ако не я получите в разумен период от време, проверете папките си за спам и junk.<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" : "Знам какво правя",
+ "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържете се с администратора.",
"No" : "Не",
"Yes" : "Да",
- "Choose" : "Избери",
+ "Choose" : "Избиране",
"Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
"Ok" : "Добре",
"Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+ "read-only" : "Само за четене",
"_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов проблем","{count} файлови проблема"],
- "One file conflict" : "Един файлов проблем",
+ "One file conflict" : "Един файлов конфликт",
"New Files" : "Нови файлове",
"Already existing files" : "Вече съществуващи файлове",
- "Which files do you want to keep?" : "Кои файлове желаеш да запазиш?",
- "If you select both versions, the copied file will have a number added to its name." : "Ако избереш и двете версии, към името на копирания файл ще бъде добавено число.",
+ "Which files do you want to keep?" : "Кои файлове желете да запазите?",
+ "If you select both versions, the copied file will have a number added to its name." : "Ако изберете и двете версии, към името на копирания файл ще бъде добавено число.",
"Cancel" : "Отказ",
- "Continue" : "Продължи",
+ "Continue" : "Продължаване",
"(all selected)" : "(всички избрани)",
"({count} selected)" : "({count} избрани)",
- "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуваш файл.",
+ "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуващ файл.",
"Very weak password" : "Много слаба парола",
"Weak password" : "Слаба парола",
"So-so password" : "Не особено добра парола",
"Good password" : "Добра парола",
"Strong password" : "Сигурна парола",
- "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
+ "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web сървърът Ви все още не е правилно настроен, за да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
"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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
"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." : "Твоята директория за данни и файлове вероятно са достъпни от интернет. .htaccess файла не функционира. Силно препоръчваме да настроиш уебсъръра по такъв начин, че директорията за данни да не бъде достъпна или да я преместиш извън директорията корен на сървъра.",
"Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
@@ -68,42 +69,46 @@
"Shared with {recipients}" : "Споделено с {recipients}.",
"Share" : "Споделяне",
"Error" : "Грешка",
- "Error while sharing" : "Грешка при споделянето.",
- "Error while unsharing" : "Грешка докато се премахва споделянето.",
- "Error while changing permissions" : "Грешка при промяна на достъпа.",
+ "Error while sharing" : "Грешка при споделяне",
+ "Error while unsharing" : "Грешка при премахване на споделянето",
+ "Error while changing permissions" : "Грешка при промяна на привилегиите",
"Shared with you and the group {group} by {owner}" : "Споделено с теб и група {group} от {owner}.",
"Shared with you by {owner}" : "Споделено с теб от {owner}.",
"Share with user or group …" : "Сподели с потребител или група...",
"Share link" : "Връзка за споделяне",
"The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
+ "Link" : "Връзка",
"Password protect" : "Защитено с парола",
"Password" : "Парола",
"Choose a password for the public link" : "Избери парола за общодостъпната връзка",
- "Email link to person" : "Изпрати връзка до нечия пощата",
- "Send" : "Изпрати",
- "Set expiration date" : "Посочи дата на изтичане",
+ "Allow editing" : "Позволяване на редактиране",
+ "Email link to person" : "Имейл връзка към човек",
+ "Send" : "Изпращане",
+ "Set expiration date" : "Задаване на дата на изтичане",
"Expiration" : "Изтичане",
"Expiration date" : "Дата на изтичане",
"Adding user..." : "Добавяне на потребител...",
"group" : "група",
+ "remote" : "отдалечен",
"Resharing is not allowed" : "Повторно споделяне не е разрешено.",
"Shared in {item} with {user}" : "Споделено в {item} с {user}.",
- "Unshare" : "Премахни споделяне",
- "notify by email" : "уведоми по имейла",
+ "Unshare" : "Премахване на споделяне",
+ "notify by email" : "уведомяване по електронна поща",
"can share" : "може да споделя",
"can edit" : "може да променя",
"access control" : "контрол на достъпа",
- "create" : "Създаване",
- "delete" : "изтрий",
+ "create" : "създаване",
+ "change" : "промяна",
+ "delete" : "изтриване",
"Password protected" : "Защитено с парола",
"Error unsetting expiration date" : "Грешка при премахване на дата за изтичане",
"Error setting expiration date" : "Грешка при поставяне на дата за изтичане",
"Sending ..." : "Изпращане ...",
- "Email sent" : "Имейла е изпратен",
+ "Email sent" : "Електронната поща е изпратена",
"Warning" : "Предупреждение",
"The object type is not specified." : "Видът на обекта не е избран.",
- "Enter new" : "Въведи нов",
- "Delete" : "Изтрий",
+ "Enter new" : "Въвеждане на нов",
+ "Delete" : "Изтриване",
"Add" : "Добавяне",
"Edit tags" : "Промяна на етикетите",
"Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
@@ -112,9 +117,11 @@
"Hello world!" : "Здравей Свят!",
"sunny" : "слънчево",
"Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}",
+ "Hello {name}" : "Здравейте, {name}",
"_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
"Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
"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." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, увери се, че потребителското име е правилно.",
@@ -123,48 +130,54 @@
"Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
"New password" : "Нова парола",
"New Password" : "Нова Парола",
- "Reset password" : "Възстановяване на парола",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
- "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
- "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
+ "Reset password" : "Възстановяване на паролата",
+ "Searching other places" : "Търсене в други места",
+ "No search result in other places" : "Няма резултати от търсене в други места",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} резултат от търсене в други места","{count} резултати от търсене в други места"],
+ "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвайте го на свой собствен риск!",
+ "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля, помисли дали не бихте желали да използваште GNU/Linux сървър.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Изглежда тази %s инсталация работи в 32-битова PHP среда и open_basedir е бил конфигуриран в php.ini. Това ще доведе до проблеми с файлове по-големи от 4GB и е крайно не-препоръчително.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Моля, премахтене настройката за open_basedir от вашия php.ini или преминете към 64-битов PHP.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Изглежда тази %s инсталация работи в 32-битова PHP среда и cURL не е инсталиран. Това ще доведе до проблеми с файлове по-големи от 4GB и е крайно не-препоръчително.",
+ "Please install the cURL extension and restart your webserver." : "Моля инсталирайте cURL разширението и рестартирайте вашия мрежови сървър.",
"Personal" : "Лични",
"Users" : "Потребители",
"Apps" : "Приложения",
"Admin" : "Админ",
"Help" : "Помощ",
- "Error loading tags" : "Грешка при зареждане на етикети.",
- "Tag already exists" : "Етикетите вече съществуват.",
+ "Error loading tags" : "Грешка при зареждане на етикети",
+ "Tag already exists" : "Етикетите вече съществуват",
"Error deleting tag(s)" : "Грешка при изтриване на етикет(и).",
"Error tagging" : "Грешка при задаване на етикета.",
"Error untagging" : "Грешка при премахване на етикета.",
- "Error favoriting" : "Грешка при отбелязване за любим.",
- "Error unfavoriting" : "Грешка при премахване отбелязването за любим.",
+ "Error favoriting" : "Грешка при отбелязване в любими.",
+ "Error unfavoriting" : "Грешка при премахване отбелязването в любими.",
"Access forbidden" : "Достъпът е забранен",
- "File not found" : "Файлът не е открит.",
- "The specified document has not been found on the server." : "Избраният документ не е намерн на сървъра.",
- "You can click here to return to %s." : "Можеш да натиснеш тук, за да се върнеш на %s",
+ "File not found" : "Файлът не е открит",
+ "The specified document has not been found on the server." : "Избраният документ не е намерен на сървъра.",
+ "You can click here to return to %s." : "Можете да натиснете тук, за да се върнете на %s",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n",
"The share will expire on %s." : "Споделянето ще изтече на %s.",
"Cheers!" : "Поздрави!",
"Internal Server Error" : "Вътрешна системна грешка",
"The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
- "More details can be found in the server log." : "Допълнителна информация може да бъде открита в сървърните доклади.",
- "Technical details" : "Техническа информация",
- "Remote Address: %s" : "Remote Address: %s",
- "Request ID: %s" : "Request ID: %s",
- "Code: %s" : "Code: %s",
- "Message: %s" : "Message: %s",
+ "More details can be found in the server log." : "Повече детайли могат да бъдат намерени в сървърния журнал.",
+ "Technical details" : "Технически подробности",
+ "Remote Address: %s" : "Отдалечен адрес: %s",
+ "Request ID: %s" : "ID на заявка: %s",
+ "Code: %s" : "Код: %s",
+ "Message: %s" : "Съобщение: %s",
"File: %s" : "File: %s",
"Line: %s" : "Line: %s",
"Trace" : "Trace",
- "Security Warning" : "Предупреждение за Сигурноста",
+ "Security Warning" : "Предупреждение за сигурноста",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Твоята PHP версия е податлива на NULL Byte атака (CVE-2006-7243).",
"Please update your PHP installation to use %s securely." : "Моля, обнови своята PHP инсталация, за да използваш %s сигурно.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
- "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
- "Username" : "Потребител",
+ "Create an <strong>admin account</strong>" : "Създаване на <strong>администраторски профил</strong>.",
+ "Username" : "Потребителско име",
"Storage & database" : "Дисково пространство и база данни",
"Data folder" : "Директория за данни",
"Configure the database" : "Конфигуриране на базата данни",
@@ -172,9 +185,8 @@
"Database user" : "Потребител за базата данни",
"Database password" : "Парола за базата данни",
"Database name" : "Име на базата данни",
- "Database tablespace" : "Tablespace-а за базата данни",
+ "Database tablespace" : "Tablespace на базата данни",
"Database host" : "Хост за базата данни",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
"Finish setup" : "Завършване на настройките",
"Finishing …" : "Завършване...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index 03fea2f7318..4e521b85d0a 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -178,7 +178,6 @@ OC.L10N.register(
"Database name" : "Naziv baze podataka",
"Database tablespace" : "Tablespace (?) baze podataka",
"Database host" : "Glavno računalo (host) baze podataka",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
"Finish setup" : "Završite postavke",
"Finishing …" : "Završavanje...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index 9472f0b69a6..cf757c69eff 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -176,7 +176,6 @@
"Database name" : "Naziv baze podataka",
"Database tablespace" : "Tablespace (?) baze podataka",
"Database host" : "Glavno računalo (host) baze podataka",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
"Finish setup" : "Završite postavke",
"Finishing …" : "Završavanje...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 448182ea209..3782119c7fd 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -180,7 +180,6 @@ OC.L10N.register(
"Database name" : "Nom de la base de dades",
"Database tablespace" : "Espai de taula de la base de dades",
"Database host" : "Ordinador central de la base de dades",
- "SQLite will be used as database. For larger installations we recommend to change this." : "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
"Finish setup" : "Acaba la configuració",
"Finishing …" : "Acabant...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 66d05b407de..c2f84d71354 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -178,7 +178,6 @@
"Database name" : "Nom de la base de dades",
"Database tablespace" : "Espai de taula de la base de dades",
"Database host" : "Ordinador central de la base de dades",
- "SQLite will be used as database. For larger installations we recommend to change this." : "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
"Finish setup" : "Acaba la configuració",
"Finishing …" : "Acabant...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index efcd393c253..9f0d372c1fd 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Název databáze",
"Database tablespace" : "Tabulkový prostor databáze",
"Database host" : "Hostitel databáze",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
+ "Performance Warning" : "Varování o výkonu",
+ "SQLite will be used as database." : "Bude použita SQLite databáze.",
+ "For larger installations we recommend to choose a different database backend." : "Pro větší instalace doporučujeme vybrat robustnější databázové řešení.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
"Finish setup" : "Dokončit nastavení",
"Finishing …" : "Dokončuji...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 0f2468581b8..412d4d4e4d5 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -187,7 +187,10 @@
"Database name" : "Název databáze",
"Database tablespace" : "Tabulkový prostor databáze",
"Database host" : "Hostitel databáze",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
+ "Performance Warning" : "Varování o výkonu",
+ "SQLite will be used as database." : "Bude použita SQLite databáze.",
+ "For larger installations we recommend to choose a different database backend." : "Pro větší instalace doporučujeme vybrat robustnější databázové řešení.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
"Finish setup" : "Dokončit nastavení",
"Finishing …" : "Dokončuji...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index c6d06f97cf9..b381e4af56a 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"Good password" : "Godt kodeord",
"Strong password" : "Stærkt kodeord",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
- "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." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+ "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." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering og installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
"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." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod. ",
"Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
"Shared" : "Delt",
@@ -133,7 +133,9 @@ OC.L10N.register(
"New password" : "Ny adgangskode",
"New Password" : "Ny adgangskode",
"Reset password" : "Nulstil kodeord",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "Searching other places" : "Søger på andre steder",
+ "No search result in other places" : "Ingen søgeresultater fra andre steder",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søgeresultat fra andre steder","{count} søgeresultater fra andre steder"],
"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.",
"It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Det ser ud til, at denne %s-instans kører på et 32-bit PHP-miljø, samt at open_basedir er blevet konfigureret gennem php.ini. Dette vil føre til problemer med filer som er større end 4GB, og frarådes kraftigt.",
@@ -150,8 +152,8 @@ OC.L10N.register(
"Error deleting tag(s)" : "Fejl ved sletning af mærke(r)",
"Error tagging" : "Fejl ved opmærkning",
"Error untagging" : "Fejl ved fjernelse af opmærkning",
- "Error favoriting" : "Fejl ved favoritering",
- "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
+ "Error favoriting" : "Fejl ved omdannelse til foretrukken",
+ "Error unfavoriting" : "Fejl ved fjernelse fra foretrukken.",
"Access forbidden" : "Adgang forbudt",
"File not found" : "Filen blev ikke fundet",
"The specified document has not been found on the server." : "Det angivne dokument blev ikke fundet på serveren.",
@@ -187,7 +189,6 @@ OC.L10N.register(
"Database name" : "Navn på database",
"Database tablespace" : "Database tabelplads",
"Database host" : "Databasehost",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
"Finish setup" : "Afslut opsætning",
"Finishing …" : "Færdigbehandler ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</a> og genindlæs siden.",
@@ -214,7 +215,7 @@ OC.L10N.register(
"The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
"Start update" : "Begynd opdatering",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb ved større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
"This %s instance is currently being updated, which may take a while." : "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
"This page will refresh itself when the %s instance is available again." : "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
},
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 114dd37ffa4..45f0231952e 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -62,7 +62,7 @@
"Good password" : "Godt kodeord",
"Strong password" : "Stærkt kodeord",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
- "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." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+ "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." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering og installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
"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." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod. ",
"Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
"Shared" : "Delt",
@@ -131,7 +131,9 @@
"New password" : "Ny adgangskode",
"New Password" : "Ny adgangskode",
"Reset password" : "Nulstil kodeord",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "Searching other places" : "Søger på andre steder",
+ "No search result in other places" : "Ingen søgeresultater fra andre steder",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søgeresultat fra andre steder","{count} søgeresultater fra andre steder"],
"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.",
"It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Det ser ud til, at denne %s-instans kører på et 32-bit PHP-miljø, samt at open_basedir er blevet konfigureret gennem php.ini. Dette vil føre til problemer med filer som er større end 4GB, og frarådes kraftigt.",
@@ -148,8 +150,8 @@
"Error deleting tag(s)" : "Fejl ved sletning af mærke(r)",
"Error tagging" : "Fejl ved opmærkning",
"Error untagging" : "Fejl ved fjernelse af opmærkning",
- "Error favoriting" : "Fejl ved favoritering",
- "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
+ "Error favoriting" : "Fejl ved omdannelse til foretrukken",
+ "Error unfavoriting" : "Fejl ved fjernelse fra foretrukken.",
"Access forbidden" : "Adgang forbudt",
"File not found" : "Filen blev ikke fundet",
"The specified document has not been found on the server." : "Det angivne dokument blev ikke fundet på serveren.",
@@ -185,7 +187,6 @@
"Database name" : "Navn på database",
"Database tablespace" : "Database tabelplads",
"Database host" : "Databasehost",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
"Finish setup" : "Afslut opsætning",
"Finishing …" : "Færdigbehandler ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</a> og genindlæs siden.",
@@ -212,7 +213,7 @@
"The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
"Start update" : "Begynd opdatering",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb ved større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
"This %s instance is currently being updated, which may take a while." : "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
"This page will refresh itself when the %s instance is available again." : "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 473372afd61..78e9f741de5 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -36,8 +36,8 @@ OC.L10N.register(
"Settings" : "Einstellungen",
"Saving..." : "Speichern...",
"Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen 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." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
- "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?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+ "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." : "Der Link zum Rücksetzen Deines Passworts ist an Deine E-Mail-Adresse vesandt worden. Wenn Du ihn innerhalb eines annehmbaren Zeitraums nicht empfängst, prüfe Deine Spam-Ordner.<br>Sollte er sich nicht darin befinden, frage bei Deinem lokalen Administrator nach.",
+ "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?" : "Deine Dateien sind verschlüsselt. Solltest Du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, Deine Daten zurückzuerhalten, nachdem Dein Passwort zurückgesetzt ist.<br />Falls Du Dir nicht sicher bist, was zu tun ist, kontaktiere bitte Deinen Administrator, bevor Du fortfährst.<br />Willst Du wirklich fortfahren?",
"I know what I'm doing" : "Ich weiß, was ich mache",
"Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
"No" : "Nein",
@@ -63,8 +63,8 @@ OC.L10N.register(
"So-so password" : "Durchschnittliches Passwort",
"Good password" : "Gutes Passwort",
"Strong password" : "Starkes Passwort",
- "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.",
- "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.",
+ "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+ "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 Du alle Funktionen nutzen willst.",
"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.",
"Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
"Shared" : "Geteilt",
@@ -77,8 +77,8 @@ OC.L10N.register(
"Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
"Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
"Share with user or group …" : "Mit Benutzer oder Gruppe teilen ....",
- "Share link" : "Link Teilen",
- "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+ "Share link" : "Link teilen",
+ "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
"Link" : "Link",
"Password protect" : "Passwortschutz",
"Password" : "Passwort",
@@ -122,12 +122,12 @@ OC.L10N.register(
"Hello {name}" : "Hallo {name}",
"_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
"Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
- "Please reload the page." : "Bitte lade diese Seite neu.",
+ "Please reload the page." : "Bitte lade die Seite neu.",
"The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
"The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
"Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
- "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
- "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+ "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stelle sicher, dass Dein Benutzername korrekt ist.",
+ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann aufgrund einer nicht vorhandenen E-Mail-Adresse für diesen Benutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
"%s password reset" : "%s-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
"New password" : "Neues Passwort",
@@ -136,10 +136,10 @@ OC.L10N.register(
"Searching other places" : "Andere Orte durchsuchen",
"No search result in other places" : "Keine Suchergebnisse in den anderen Orten",
"_{count} search result in other places_::_{count} search results in other places_" : ["{count} Suchergebnis in den anderen Orten","{count} Suchergebnisse in den anderen Orten"],
- "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
- "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
- "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Es scheint, dass die %s - Instanz unter einer 32Bit PHP-Umgebung läuft und die open_basedir wurde in der php.ini konfiguriert. Dies führt zu Problemen mit Dateien über 4 GB und wird dringend abgeraten.",
- "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Bitte entferne die open_basedir - Einstellung in Deiner php.ini oder wechsle zum 64Bit-PHP.",
+ "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!",
+ "For the best results, please consider using a GNU/Linux server instead." : "Für einen optimalen Betrieb sollte stattdessen ein GNU/Linux-Server verwendet werden.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Es scheint, dass diese %s-Instanz unter einer 32-Bit-PHP-Umgebung läuft und open_basedir in der Datei php.ini konfiguriert ist. Dies führt zu Problemen mit Dateien über 4 GB und es wird dringend von einem solchen Betrieb abgeraten.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Bitte entferne die open_basedir-Einstellung in Deiner php.ini oder wechsele zu 64-Bit-PHP.",
"It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Es scheint, dass die %s - Instanz unter einer 32Bit PHP-Umgebung läuft und cURL ist nicht installiert. Dies führt zu Problemen mit Dateien über 4 GB und wird dringend abgeraten.",
"Please install the cURL extension and restart your webserver." : "Bitte installiere die cURL-Erweiterung und starte den Webserver neu.",
"Personal" : "Persönlich",
@@ -161,9 +161,9 @@ OC.L10N.register(
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
"The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
"Cheers!" : "Hallo!",
- "Internal Server Error" : "Interner Server-Fehler",
+ "Internal Server Error" : "Interner Serverfehler",
"The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
- "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
+ "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, sollte dieser Fehler mehrfach auftreten, und füge Deiner Anfrage die unten stehenden technischen Details bei.",
"More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
"Technical details" : "Technische Details",
"Remote Address: %s" : "IP Adresse: %s",
@@ -174,7 +174,7 @@ OC.L10N.register(
"Line: %s" : "Zeile: %s",
"Trace" : "Spur",
"Security Warning" : "Sicherheitswarnung",
- "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP-Version ist durch die NULL-Byte-Attacke (CVE-2006-7243) angreifbar",
"Please update your PHP installation to use %s securely." : "Bitte aktualisiere Deine PHP-Installation um %s sicher nutzen zu können.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Datenbank-Name",
"Database tablespace" : "Datenbank-Tablespace",
"Database host" : "Datenbank-Host",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
+ "Performance Warning" : "Leistungswarnung",
+ "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
+ "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
"Finish setup" : "Installation abschließen",
"Finishing …" : "Abschließen ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 021bc4c313f..0aa0bfd50e0 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -34,8 +34,8 @@
"Settings" : "Einstellungen",
"Saving..." : "Speichern...",
"Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen 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." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
- "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?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+ "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." : "Der Link zum Rücksetzen Deines Passworts ist an Deine E-Mail-Adresse vesandt worden. Wenn Du ihn innerhalb eines annehmbaren Zeitraums nicht empfängst, prüfe Deine Spam-Ordner.<br>Sollte er sich nicht darin befinden, frage bei Deinem lokalen Administrator nach.",
+ "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?" : "Deine Dateien sind verschlüsselt. Solltest Du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, Deine Daten zurückzuerhalten, nachdem Dein Passwort zurückgesetzt ist.<br />Falls Du Dir nicht sicher bist, was zu tun ist, kontaktiere bitte Deinen Administrator, bevor Du fortfährst.<br />Willst Du wirklich fortfahren?",
"I know what I'm doing" : "Ich weiß, was ich mache",
"Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
"No" : "Nein",
@@ -61,8 +61,8 @@
"So-so password" : "Durchschnittliches Passwort",
"Good password" : "Gutes Passwort",
"Strong password" : "Starkes Passwort",
- "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.",
- "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.",
+ "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+ "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 Du alle Funktionen nutzen willst.",
"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.",
"Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
"Shared" : "Geteilt",
@@ -75,8 +75,8 @@
"Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
"Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
"Share with user or group …" : "Mit Benutzer oder Gruppe teilen ....",
- "Share link" : "Link Teilen",
- "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+ "Share link" : "Link teilen",
+ "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
"Link" : "Link",
"Password protect" : "Passwortschutz",
"Password" : "Passwort",
@@ -120,12 +120,12 @@
"Hello {name}" : "Hallo {name}",
"_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
"Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
- "Please reload the page." : "Bitte lade diese Seite neu.",
+ "Please reload the page." : "Bitte lade die Seite neu.",
"The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
"The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
"Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
- "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
- "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+ "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stelle sicher, dass Dein Benutzername korrekt ist.",
+ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann aufgrund einer nicht vorhandenen E-Mail-Adresse für diesen Benutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
"%s password reset" : "%s-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
"New password" : "Neues Passwort",
@@ -134,10 +134,10 @@
"Searching other places" : "Andere Orte durchsuchen",
"No search result in other places" : "Keine Suchergebnisse in den anderen Orten",
"_{count} search result in other places_::_{count} search results in other places_" : ["{count} Suchergebnis in den anderen Orten","{count} Suchergebnisse in den anderen Orten"],
- "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
- "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
- "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Es scheint, dass die %s - Instanz unter einer 32Bit PHP-Umgebung läuft und die open_basedir wurde in der php.ini konfiguriert. Dies führt zu Problemen mit Dateien über 4 GB und wird dringend abgeraten.",
- "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Bitte entferne die open_basedir - Einstellung in Deiner php.ini oder wechsle zum 64Bit-PHP.",
+ "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!",
+ "For the best results, please consider using a GNU/Linux server instead." : "Für einen optimalen Betrieb sollte stattdessen ein GNU/Linux-Server verwendet werden.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Es scheint, dass diese %s-Instanz unter einer 32-Bit-PHP-Umgebung läuft und open_basedir in der Datei php.ini konfiguriert ist. Dies führt zu Problemen mit Dateien über 4 GB und es wird dringend von einem solchen Betrieb abgeraten.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Bitte entferne die open_basedir-Einstellung in Deiner php.ini oder wechsele zu 64-Bit-PHP.",
"It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Es scheint, dass die %s - Instanz unter einer 32Bit PHP-Umgebung läuft und cURL ist nicht installiert. Dies führt zu Problemen mit Dateien über 4 GB und wird dringend abgeraten.",
"Please install the cURL extension and restart your webserver." : "Bitte installiere die cURL-Erweiterung und starte den Webserver neu.",
"Personal" : "Persönlich",
@@ -159,9 +159,9 @@
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
"The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
"Cheers!" : "Hallo!",
- "Internal Server Error" : "Interner Server-Fehler",
+ "Internal Server Error" : "Interner Serverfehler",
"The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
- "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
+ "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, sollte dieser Fehler mehrfach auftreten, und füge Deiner Anfrage die unten stehenden technischen Details bei.",
"More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
"Technical details" : "Technische Details",
"Remote Address: %s" : "IP Adresse: %s",
@@ -172,7 +172,7 @@
"Line: %s" : "Zeile: %s",
"Trace" : "Spur",
"Security Warning" : "Sicherheitswarnung",
- "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP-Version ist durch die NULL-Byte-Attacke (CVE-2006-7243) angreifbar",
"Please update your PHP installation to use %s securely." : "Bitte aktualisiere Deine PHP-Installation um %s sicher nutzen zu können.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
@@ -187,7 +187,10 @@
"Database name" : "Datenbank-Name",
"Database tablespace" : "Datenbank-Tablespace",
"Database host" : "Datenbank-Host",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
+ "Performance Warning" : "Leistungswarnung",
+ "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
+ "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
"Finish setup" : "Installation abschließen",
"Finishing …" : "Abschließen ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
index cb4c259c776..6360bbb6253 100644
--- a/core/l10n/de_AT.js
+++ b/core/l10n/de_AT.js
@@ -32,6 +32,7 @@ OC.L10N.register(
"can share" : "Kann teilen",
"can edit" : "kann bearbeiten",
"Delete" : "Löschen",
+ "Add" : "Hinzufügen",
"_download %n file_::_download %n files_" : ["",""],
"_{count} search result in other places_::_{count} search results in other places_" : ["",""],
"Personal" : "Persönlich",
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
index abca8b2d6a0..21cb4b16102 100644
--- a/core/l10n/de_AT.json
+++ b/core/l10n/de_AT.json
@@ -30,6 +30,7 @@
"can share" : "Kann teilen",
"can edit" : "kann bearbeiten",
"Delete" : "Löschen",
+ "Add" : "Hinzufügen",
"_download %n file_::_download %n files_" : ["",""],
"_{count} search result in other places_::_{count} search results in other places_" : ["",""],
"Personal" : "Persönlich",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 01308275f56..21d4775fdb0 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -76,7 +76,7 @@ OC.L10N.register(
"Error while changing permissions" : "Fehler bei der Änderung der Rechte",
"Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
"Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
- "Share with user or group …" : "Mit Benutzer oder Gruppe teilen …",
+ "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…",
"Share link" : "Link teilen",
"The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
"Link" : "Link",
@@ -89,7 +89,7 @@ OC.L10N.register(
"Set expiration date" : "Ein Ablaufdatum setzen",
"Expiration" : "Ablaufdatum",
"Expiration date" : "Ablaufdatum",
- "Adding user..." : "Benutzer wird hinzugefügt …",
+ "Adding user..." : "Benutzer wird hinzugefügt…",
"group" : "Gruppe",
"remote" : "Entfernte Freigabe",
"Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
@@ -122,7 +122,7 @@ OC.L10N.register(
"Hello {name}" : "Hallo {name}",
"_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
"Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
- "Please reload the page." : "Bitte laden Sie diese Seite neu.",
+ "Please reload the page." : "Bitte laden Sie die Seite neu.",
"The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
"The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
"Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Datenbank-Name",
"Database tablespace" : "Datenbank-Tablespace",
"Database host" : "Datenbank-Host",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
+ "Performance Warning" : "Leistungswarnung",
+ "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
+ "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
"Finish setup" : "Installation abschließen",
"Finishing …" : "Abschließen ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 17548ecd471..79d2e494085 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -74,7 +74,7 @@
"Error while changing permissions" : "Fehler bei der Änderung der Rechte",
"Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
"Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
- "Share with user or group …" : "Mit Benutzer oder Gruppe teilen …",
+ "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…",
"Share link" : "Link teilen",
"The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
"Link" : "Link",
@@ -87,7 +87,7 @@
"Set expiration date" : "Ein Ablaufdatum setzen",
"Expiration" : "Ablaufdatum",
"Expiration date" : "Ablaufdatum",
- "Adding user..." : "Benutzer wird hinzugefügt …",
+ "Adding user..." : "Benutzer wird hinzugefügt…",
"group" : "Gruppe",
"remote" : "Entfernte Freigabe",
"Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
@@ -120,7 +120,7 @@
"Hello {name}" : "Hallo {name}",
"_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
"Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
- "Please reload the page." : "Bitte laden Sie diese Seite neu.",
+ "Please reload the page." : "Bitte laden Sie die Seite neu.",
"The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
"The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
"Couldn't reset password because the token is invalid" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
@@ -187,7 +187,10 @@
"Database name" : "Datenbank-Name",
"Database tablespace" : "Datenbank-Tablespace",
"Database host" : "Datenbank-Host",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
+ "Performance Warning" : "Leistungswarnung",
+ "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
+ "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
"Finish setup" : "Installation abschließen",
"Finishing …" : "Abschließen ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 280aac1dfa9..8077e74422e 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -181,7 +181,6 @@ OC.L10N.register(
"Database name" : "Όνομα βάσης δεδομένων",
"Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
"Database host" : "Διακομιστής βάσης δεδομένων",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
"Finish setup" : "Ολοκλήρωση εγκατάστασης",
"Finishing …" : "Ολοκλήρωση...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 333d456d795..e7b72089cea 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -179,7 +179,6 @@
"Database name" : "Όνομα βάσης δεδομένων",
"Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
"Database host" : "Διακομιστής βάσης δεδομένων",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
"Finish setup" : "Ολοκλήρωση εγκατάστασης",
"Finishing …" : "Ολοκλήρωση...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 40f6b8d9ebc..7357f88722a 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -189,7 +189,6 @@ OC.L10N.register(
"Database name" : "Database name",
"Database tablespace" : "Database tablespace",
"Database host" : "Database host",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite will be used as database. For larger installations we recommend changing this.",
"Finish setup" : "Finish setup",
"Finishing …" : "Finishing …",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 5dfbbd17352..43199d53122 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -187,7 +187,6 @@
"Database name" : "Database name",
"Database tablespace" : "Database tablespace",
"Database host" : "Database host",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite will be used as database. For larger installations we recommend changing this.",
"Finish setup" : "Finish setup",
"Finishing …" : "Finishing …",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index b0f96a4079b..05c65f263f9 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -189,7 +189,9 @@ OC.L10N.register(
"Database name" : "Nombre de la base de datos",
"Database tablespace" : "Espacio de tablas de la base de datos",
"Database host" : "Host de la base de datos",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
+ "Performance Warning" : "Advertencia de rendimiento",
+ "SQLite will be used as database." : "SQLite se empleará como base de datos.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para que se sincronizan los ficheros.",
"Finish setup" : "Completar la instalación",
"Finishing …" : "Finalizando...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "La aplicación requiere JavaScript para poder operar correctamente. Habilite <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y recarge la página.",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 3a10f78238b..0d327c3a818 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -187,7 +187,9 @@
"Database name" : "Nombre de la base de datos",
"Database tablespace" : "Espacio de tablas de la base de datos",
"Database host" : "Host de la base de datos",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
+ "Performance Warning" : "Advertencia de rendimiento",
+ "SQLite will be used as database." : "SQLite se empleará como base de datos.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para que se sincronizan los ficheros.",
"Finish setup" : "Completar la instalación",
"Finishing …" : "Finalizando...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "La aplicación requiere JavaScript para poder operar correctamente. Habilite <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y recarge la página.",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index de21e543a50..9d98f1c182e 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -176,7 +176,6 @@ OC.L10N.register(
"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 for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 4bd285f7fe2..154c56f8cf5 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -174,7 +174,6 @@
"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 for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index 151b517c012..8cddc775c28 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -46,6 +46,7 @@ OC.L10N.register(
"Error loading file picker template: {error}" : "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Ok" : "Ados",
"Error loading message template: {error}" : "Errorea mezu txantiloia kargatzean: {error}",
+ "read-only" : "irakurtzeko-soilik",
"_{count} file conflict_::_{count} file conflicts_" : ["fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"],
"One file conflict" : "Fitxategi batek konfliktua sortu du",
"New Files" : "Fitxategi Berriak",
@@ -78,9 +79,11 @@ OC.L10N.register(
"Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
"Share link" : "Elkarbanatu lotura",
"The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta {days} egunetara.",
+ "Link" : "Esteka",
"Password protect" : "Babestu pasahitzarekin",
"Password" : "Pasahitza",
"Choose a password for the public link" : "Aukeratu pasahitz bat esteka publikorako",
+ "Allow editing" : "Baimendu editatzea",
"Email link to person" : "Postaz bidali lotura ",
"Send" : "Bidali",
"Set expiration date" : "Ezarri muga data",
@@ -88,6 +91,7 @@ OC.L10N.register(
"Expiration date" : "Muga data",
"Adding user..." : "Erabiltzailea gehitzen...",
"group" : "taldea",
+ "remote" : "urrunekoa",
"Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
"Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
"Unshare" : "Ez elkarbanatu",
@@ -96,6 +100,7 @@ OC.L10N.register(
"can edit" : "editatu dezake",
"access control" : "sarrera kontrola",
"create" : "sortu",
+ "change" : "aldatu",
"delete" : "ezabatu",
"Password protected" : "Pasahitzarekin babestuta",
"Error unsetting expiration date" : "Errorea izan da muga data kentzean",
@@ -110,9 +115,15 @@ OC.L10N.register(
"Edit tags" : "Editatu etiketak",
"Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
"No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
- "_download %n file_::_download %n files_" : ["",""],
+ "unknown text" : "testu ezezaguna",
+ "Hello world!" : "Kaixo Mundua!",
+ "sunny" : "eguzkitsua",
+ "Hello {name}, the weather is {weather}" : "Kaixo {name}, eguraldia {weather} da",
+ "Hello {name}" : "Kaixo {name}",
+ "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"],
"Updating {productName} to version {version}, this may take a while." : "Eguneratu {productName} {version} bertsiora, bere denbora behar du.",
"Please reload the page." : "Mesedez birkargatu orria.",
+ "The update was unsuccessful. " : "Eguneraketa ongi burutu da.",
"The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
"Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
"Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
@@ -122,9 +133,15 @@ OC.L10N.register(
"New password" : "Pasahitz berria",
"New Password" : "Pasahitz Berria",
"Reset password" : "Berrezarri pasahitza",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "Searching other places" : "Beste lekuak bilatzen",
+ "No search result in other places" : "Ez da bilaketaren emaitzik lortu beste lekuetan",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["Bilaketa emaitza {count} beste lekuetan","{count} emaitza lortu dira beste lekuetan"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
"For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Dirudi %s instantzia hau 32biteko PHP ingurunean ari dela eta open_basedir php.ini fitxategian konfiguratu dela. Honek 4GB baino gehiagoko fitxategiekin arazoak sor ditzake eta ez da aholkatzen.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Mesedez ezabatu open_basedir ezarpena zure php.ini-tik edo aldatu 64-biteko PHPra.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Dirudi %s instantzia hau 32-biteko PHP inguruan ari dela eta cURL ez dago instalaturik. Honek 4GB baino gehiagoko fitxategiekin arazoak sor ditzake eta ez da aholkatzen.",
+ "Please install the cURL extension and restart your webserver." : "Mesedez instalatu cURL extensioa eta berrabiarazi zure web zerbitzaria.",
"Personal" : "Pertsonala",
"Users" : "Erabiltzaileak",
"Apps" : "Aplikazioak",
@@ -172,7 +189,6 @@ OC.L10N.register(
"Database name" : "Datubasearen izena",
"Database tablespace" : "Datu basearen taula-lekua",
"Database host" : "Datubasearen hostalaria",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
"Finish setup" : "Bukatu konfigurazioa",
"Finishing …" : "Bukatzen...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 6506131b089..6e7973cabe4 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -44,6 +44,7 @@
"Error loading file picker template: {error}" : "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Ok" : "Ados",
"Error loading message template: {error}" : "Errorea mezu txantiloia kargatzean: {error}",
+ "read-only" : "irakurtzeko-soilik",
"_{count} file conflict_::_{count} file conflicts_" : ["fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"],
"One file conflict" : "Fitxategi batek konfliktua sortu du",
"New Files" : "Fitxategi Berriak",
@@ -76,9 +77,11 @@
"Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
"Share link" : "Elkarbanatu lotura",
"The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta {days} egunetara.",
+ "Link" : "Esteka",
"Password protect" : "Babestu pasahitzarekin",
"Password" : "Pasahitza",
"Choose a password for the public link" : "Aukeratu pasahitz bat esteka publikorako",
+ "Allow editing" : "Baimendu editatzea",
"Email link to person" : "Postaz bidali lotura ",
"Send" : "Bidali",
"Set expiration date" : "Ezarri muga data",
@@ -86,6 +89,7 @@
"Expiration date" : "Muga data",
"Adding user..." : "Erabiltzailea gehitzen...",
"group" : "taldea",
+ "remote" : "urrunekoa",
"Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
"Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
"Unshare" : "Ez elkarbanatu",
@@ -94,6 +98,7 @@
"can edit" : "editatu dezake",
"access control" : "sarrera kontrola",
"create" : "sortu",
+ "change" : "aldatu",
"delete" : "ezabatu",
"Password protected" : "Pasahitzarekin babestuta",
"Error unsetting expiration date" : "Errorea izan da muga data kentzean",
@@ -108,9 +113,15 @@
"Edit tags" : "Editatu etiketak",
"Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
"No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
- "_download %n file_::_download %n files_" : ["",""],
+ "unknown text" : "testu ezezaguna",
+ "Hello world!" : "Kaixo Mundua!",
+ "sunny" : "eguzkitsua",
+ "Hello {name}, the weather is {weather}" : "Kaixo {name}, eguraldia {weather} da",
+ "Hello {name}" : "Kaixo {name}",
+ "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"],
"Updating {productName} to version {version}, this may take a while." : "Eguneratu {productName} {version} bertsiora, bere denbora behar du.",
"Please reload the page." : "Mesedez birkargatu orria.",
+ "The update was unsuccessful. " : "Eguneraketa ongi burutu da.",
"The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
"Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
"Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
@@ -120,9 +131,15 @@
"New password" : "Pasahitz berria",
"New Password" : "Pasahitz Berria",
"Reset password" : "Berrezarri pasahitza",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "Searching other places" : "Beste lekuak bilatzen",
+ "No search result in other places" : "Ez da bilaketaren emaitzik lortu beste lekuetan",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["Bilaketa emaitza {count} beste lekuetan","{count} emaitza lortu dira beste lekuetan"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
"For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Dirudi %s instantzia hau 32biteko PHP ingurunean ari dela eta open_basedir php.ini fitxategian konfiguratu dela. Honek 4GB baino gehiagoko fitxategiekin arazoak sor ditzake eta ez da aholkatzen.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Mesedez ezabatu open_basedir ezarpena zure php.ini-tik edo aldatu 64-biteko PHPra.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Dirudi %s instantzia hau 32-biteko PHP inguruan ari dela eta cURL ez dago instalaturik. Honek 4GB baino gehiagoko fitxategiekin arazoak sor ditzake eta ez da aholkatzen.",
+ "Please install the cURL extension and restart your webserver." : "Mesedez instalatu cURL extensioa eta berrabiarazi zure web zerbitzaria.",
"Personal" : "Pertsonala",
"Users" : "Erabiltzaileak",
"Apps" : "Aplikazioak",
@@ -170,7 +187,6 @@
"Database name" : "Datubasearen izena",
"Database tablespace" : "Datu basearen taula-lekua",
"Database host" : "Datubasearen hostalaria",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
"Finish setup" : "Bukatu konfigurazioa",
"Finishing …" : "Bukatzen...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 3ab176c66d9..24aab7f59ef 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Tietokannan nimi",
"Database tablespace" : "Tietokannan taulukkotila",
"Database host" : "Tietokantapalvelin",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
+ "Performance Warning" : "Suorituskykyvaroitus",
+ "SQLite will be used as database." : "SQLitea käytetään tietokantana.",
+ "For larger installations we recommend to choose a different database backend." : "Suuria asennuksia varten suositellaan muun tietokannan käyttöä.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
"Finish setup" : "Viimeistele asennus",
"Finishing …" : "Valmistellaan…",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 12478197e7a..55aa9408100 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -187,7 +187,10 @@
"Database name" : "Tietokannan nimi",
"Database tablespace" : "Tietokannan taulukkotila",
"Database host" : "Tietokantapalvelin",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
+ "Performance Warning" : "Suorituskykyvaroitus",
+ "SQLite will be used as database." : "SQLitea käytetään tietokantana.",
+ "For larger installations we recommend to choose a different database backend." : "Suuria asennuksia varten suositellaan muun tietokannan käyttöä.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
"Finish setup" : "Viimeistele asennus",
"Finishing …" : "Valmistellaan…",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index ab40e66b3a3..2ea5d59da1e 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Nom de la base de données",
"Database tablespace" : "Tablespace de la base de données",
"Database host" : "Hôte de la base de données",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
+ "Performance Warning" : "Avertissement de performance",
+ "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
+ "For larger installations we recommend to choose a different database backend." : "Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
"Finish setup" : "Terminer l'installation",
"Finishing …" : "Finalisation …",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Cette application nécessite JavaScript pour fonctionner correctement. Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 4096a5b3555..a9a75750bde 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -187,7 +187,10 @@
"Database name" : "Nom de la base de données",
"Database tablespace" : "Tablespace de la base de données",
"Database host" : "Hôte de la base de données",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
+ "Performance Warning" : "Avertissement de performance",
+ "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
+ "For larger installations we recommend to choose a different database backend." : "Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
"Finish setup" : "Terminer l'installation",
"Finishing …" : "Finalisation …",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Cette application nécessite JavaScript pour fonctionner correctement. Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index fe8f7a2e974..a7304207e99 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Nome da base de datos",
"Database tablespace" : "Táboa de espazos da base de datos",
"Database host" : "Servidor da base de datos",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
+ "Performance Warning" : "Aviso de rendemento",
+ "SQLite will be used as database." : "Utilizarase SQLite como base de datos",
+ "For larger installations we recommend to choose a different database backend." : "Para instalacións grandes, recomendámoslle que empregue unha infraestrutura de base de datos diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconséllase o uso de SQLite.",
"Finish setup" : "Rematar a configuración",
"Finishing …" : "Rematando ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Este aplicativo precisa JavaScript para funcionar. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recargue a páxina.",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 71b6e850e83..017e478591d 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -187,7 +187,10 @@
"Database name" : "Nome da base de datos",
"Database tablespace" : "Táboa de espazos da base de datos",
"Database host" : "Servidor da base de datos",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
+ "Performance Warning" : "Aviso de rendemento",
+ "SQLite will be used as database." : "Utilizarase SQLite como base de datos",
+ "For larger installations we recommend to choose a different database backend." : "Para instalacións grandes, recomendámoslle que empregue unha infraestrutura de base de datos diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconséllase o uso de SQLite.",
"Finish setup" : "Rematar a configuración",
"Finishing …" : "Rematando ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Este aplicativo precisa JavaScript para funcionar. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recargue a páxina.",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 460ff8d2f48..c43e848390f 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -93,7 +93,7 @@ OC.L10N.register(
"group" : "Grupa",
"remote" : "na daljinu",
"Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
- "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+ "Shared in {item} with {user}" : "Podijeljeno u {item} sa {user}",
"Unshare" : "Prestanite dijeliti",
"notify by email" : "Obavijestite e-poštom",
"can share" : "Dijeljenje moguće",
@@ -189,7 +189,6 @@ OC.L10N.register(
"Database name" : "Naziv baze podataka",
"Database tablespace" : "Tablespace (?) baze podataka",
"Database host" : "Glavno računalo baze podataka",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
"Finish setup" : "Završite postavljanje",
"Finishing …" : "Završavanje...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 5c7bc28aa7a..6f21f8e9596 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -91,7 +91,7 @@
"group" : "Grupa",
"remote" : "na daljinu",
"Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
- "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+ "Shared in {item} with {user}" : "Podijeljeno u {item} sa {user}",
"Unshare" : "Prestanite dijeliti",
"notify by email" : "Obavijestite e-poštom",
"can share" : "Dijeljenje moguće",
@@ -187,7 +187,6 @@
"Database name" : "Naziv baze podataka",
"Database tablespace" : "Tablespace (?) baze podataka",
"Database host" : "Glavno računalo baze podataka",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
"Finish setup" : "Završite postavljanje",
"Finishing …" : "Završavanje...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 3f1389d8e20..4dd4ec6d3e0 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -188,7 +188,6 @@ OC.L10N.register(
"Database name" : "Az adatbázis neve",
"Database tablespace" : "Az adatbázis táblázattér (tablespace)",
"Database host" : "Adatbázis szerver",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
"Finish setup" : "A beállítások befejezése",
"Finishing …" : "Befejezés ...",
"%s is available. Get more information on how to update." : "%s rendelkezésre áll. További információ a frissítéshez.",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 9c004208b40..af68919397d 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -186,7 +186,6 @@
"Database name" : "Az adatbázis neve",
"Database tablespace" : "Az adatbázis táblázattér (tablespace)",
"Database host" : "Adatbázis szerver",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
"Finish setup" : "A beállítások befejezése",
"Finishing …" : "Befejezés ...",
"%s is available. Get more information on how to update." : "%s rendelkezésre áll. További információ a frissítéshez.",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 51637db6a9f..410d26e7d1f 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -43,9 +43,10 @@ OC.L10N.register(
"No" : "Tidak",
"Yes" : "Ya",
"Choose" : "Pilih",
- "Error loading file picker template: {error}" : "Galat memuat templat berkas pemilih: {error}",
+ "Error loading file picker template: {error}" : "Kesalahan saat memuat templat berkas pemilih: {error}",
"Ok" : "Oke",
"Error loading message template: {error}" : "Kesalahan memuat templat pesan: {error}",
+ "read-only" : "hanya-baca",
"_{count} file conflict_::_{count} file conflicts_" : ["{count} berkas konflik"],
"One file conflict" : "Satu berkas konflik",
"New Files" : "Berkas Baru",
@@ -69,18 +70,20 @@ OC.L10N.register(
"Shared" : "Dibagikan",
"Shared with {recipients}" : "Dibagikan dengan {recipients}",
"Share" : "Bagikan",
- "Error" : "Galat",
- "Error while sharing" : "Galat ketika membagikan",
- "Error while unsharing" : "Galat ketika membatalkan pembagian",
- "Error while changing permissions" : "Galat ketika mengubah izin",
+ "Error" : "Kesalahan",
+ "Error while sharing" : "Kesalahan saat membagikan",
+ "Error while unsharing" : "Kesalahan saat membatalkan pembagian",
+ "Error while changing permissions" : "Kesalahan saat mengubah izin",
"Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
"Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
"Share with user or group …" : "Bagikan dengan pengguna atau grup ...",
"Share link" : "Bagikan tautan",
"The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+ "Link" : "Tautan",
"Password protect" : "Lindungi dengan sandi",
"Password" : "Sandi",
"Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
+ "Allow editing" : "Izinkan penyuntingan",
"Email link to person" : "Emailkan tautan ini ke orang",
"Send" : "Kirim",
"Set expiration date" : "Atur tanggal kedaluwarsa",
@@ -88,6 +91,7 @@ OC.L10N.register(
"Expiration date" : "Tanggal kedaluwarsa",
"Adding user..." : "Menambahkan pengguna...",
"group" : "grup",
+ "remote" : "remote",
"Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
"Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
"Unshare" : "Batalkan berbagi",
@@ -96,10 +100,11 @@ OC.L10N.register(
"can edit" : "dapat sunting",
"access control" : "kontrol akses",
"create" : "buat",
+ "change" : "ubah",
"delete" : "hapus",
"Password protected" : "Sandi dilindungi",
- "Error unsetting expiration date" : "Galat ketika menghapus tanggal kedaluwarsa",
- "Error setting expiration date" : "Galat ketika mengatur tanggal kedaluwarsa",
+ "Error unsetting expiration date" : "Kesalahan saat menghapus tanggal kedaluwarsa",
+ "Error setting expiration date" : "Kesalahan saat mengatur tanggal kedaluwarsa",
"Sending ..." : "Mengirim ...",
"Email sent" : "Email terkirim",
"Warning" : "Peringatan",
@@ -108,11 +113,17 @@ OC.L10N.register(
"Delete" : "Hapus",
"Add" : "Tambah",
"Edit tags" : "Sunting label",
- "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
+ "Error loading dialog template: {error}" : "Kesalahan saat memuat templat dialog: {error}",
"No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
- "_download %n file_::_download %n files_" : [""],
+ "unknown text" : "teks tidak diketahui",
+ "Hello world!" : "Hello world!",
+ "sunny" : "cerah",
+ "Hello {name}, the weather is {weather}" : "Helo {name}, jepang {weather}",
+ "Hello {name}" : "Helo {name}",
+ "_download %n file_::_download %n files_" : ["unduh %n berkas"],
"Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
"Please reload the page." : "Silakan muat ulang halaman.",
+ "The update was unsuccessful. " : "Pembaruan tidak berhasil.",
"The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
"Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
"Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
@@ -122,21 +133,27 @@ OC.L10N.register(
"New password" : "Sandi baru",
"New Password" : "Sandi Baru",
"Reset password" : "Setel ulang sandi",
- "_{count} search result in other places_::_{count} search results in other places_" : [""],
+ "Searching other places" : "Mencari tempat lainnya",
+ "No search result in other places" : "Tidak ada hasil pencarian di tampat lainnya",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} hasil pencarian di tempat lain"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
"For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Tampaknya instansi %s berjalan di lingkungan PHP 32-bit dan open_basedir telah dikonfigurasi di php.ini. Hal ini akan menyebabkan masalah pada berkas lebih besar dari 4 GB dan sangat tidak disarankan.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Mohon hapus pengaturan open_basedir didalam php.ini atau beralih ke PHP 64-bit.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Nampaknya instansi %s berjalan di lingkungan PHP 32-bit dan cURL tidak diinstal. Hal ini akan menyebabkan masalah pada berkas lebih besar dari 4 GB dan sangat tidak disarankan.",
+ "Please install the cURL extension and restart your webserver." : "Mohon instal ekstensi cURL dan jalankan ulang server web.",
"Personal" : "Pribadi",
"Users" : "Pengguna",
"Apps" : "Aplikasi",
"Admin" : "Admin",
"Help" : "Bantuan",
- "Error loading tags" : "Galat saat memuat tag",
+ "Error loading tags" : "Kesalahan saat saat memuat tag",
"Tag already exists" : "Tag sudah ada",
- "Error deleting tag(s)" : "Galat saat menghapus tag",
- "Error tagging" : "Galat saat memberikan tag",
- "Error untagging" : "Galat saat menghapus tag",
- "Error favoriting" : "Galat saat memberikan sebagai favorit",
- "Error unfavoriting" : "Galat saat menghapus sebagai favorit",
+ "Error deleting tag(s)" : "Kesalahan saat menghapus tag",
+ "Error tagging" : "Kesalahan saat memberikan tag",
+ "Error untagging" : "Kesalahan saat menghapus tag",
+ "Error favoriting" : "Kesalahan saat memberikan sebagai favorit",
+ "Error unfavoriting" : "Kesalahan saat menghapus sebagai favorit",
"Access forbidden" : "Akses ditolak",
"File not found" : "Berkas tidak ditemukan",
"The specified document has not been found on the server." : "Dokumen yang diminta tidak tersedia pada server.",
@@ -172,7 +189,6 @@ OC.L10N.register(
"Database name" : "Nama basis data",
"Database tablespace" : "Tablespace basis data",
"Database host" : "Host basis data",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
"Finish setup" : "Selesaikan instalasi",
"Finishing …" : "Menyelesaikan ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 60ba72dbde6..635915f3936 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -41,9 +41,10 @@
"No" : "Tidak",
"Yes" : "Ya",
"Choose" : "Pilih",
- "Error loading file picker template: {error}" : "Galat memuat templat berkas pemilih: {error}",
+ "Error loading file picker template: {error}" : "Kesalahan saat memuat templat berkas pemilih: {error}",
"Ok" : "Oke",
"Error loading message template: {error}" : "Kesalahan memuat templat pesan: {error}",
+ "read-only" : "hanya-baca",
"_{count} file conflict_::_{count} file conflicts_" : ["{count} berkas konflik"],
"One file conflict" : "Satu berkas konflik",
"New Files" : "Berkas Baru",
@@ -67,18 +68,20 @@
"Shared" : "Dibagikan",
"Shared with {recipients}" : "Dibagikan dengan {recipients}",
"Share" : "Bagikan",
- "Error" : "Galat",
- "Error while sharing" : "Galat ketika membagikan",
- "Error while unsharing" : "Galat ketika membatalkan pembagian",
- "Error while changing permissions" : "Galat ketika mengubah izin",
+ "Error" : "Kesalahan",
+ "Error while sharing" : "Kesalahan saat membagikan",
+ "Error while unsharing" : "Kesalahan saat membatalkan pembagian",
+ "Error while changing permissions" : "Kesalahan saat mengubah izin",
"Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
"Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
"Share with user or group …" : "Bagikan dengan pengguna atau grup ...",
"Share link" : "Bagikan tautan",
"The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+ "Link" : "Tautan",
"Password protect" : "Lindungi dengan sandi",
"Password" : "Sandi",
"Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
+ "Allow editing" : "Izinkan penyuntingan",
"Email link to person" : "Emailkan tautan ini ke orang",
"Send" : "Kirim",
"Set expiration date" : "Atur tanggal kedaluwarsa",
@@ -86,6 +89,7 @@
"Expiration date" : "Tanggal kedaluwarsa",
"Adding user..." : "Menambahkan pengguna...",
"group" : "grup",
+ "remote" : "remote",
"Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
"Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
"Unshare" : "Batalkan berbagi",
@@ -94,10 +98,11 @@
"can edit" : "dapat sunting",
"access control" : "kontrol akses",
"create" : "buat",
+ "change" : "ubah",
"delete" : "hapus",
"Password protected" : "Sandi dilindungi",
- "Error unsetting expiration date" : "Galat ketika menghapus tanggal kedaluwarsa",
- "Error setting expiration date" : "Galat ketika mengatur tanggal kedaluwarsa",
+ "Error unsetting expiration date" : "Kesalahan saat menghapus tanggal kedaluwarsa",
+ "Error setting expiration date" : "Kesalahan saat mengatur tanggal kedaluwarsa",
"Sending ..." : "Mengirim ...",
"Email sent" : "Email terkirim",
"Warning" : "Peringatan",
@@ -106,11 +111,17 @@
"Delete" : "Hapus",
"Add" : "Tambah",
"Edit tags" : "Sunting label",
- "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
+ "Error loading dialog template: {error}" : "Kesalahan saat memuat templat dialog: {error}",
"No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
- "_download %n file_::_download %n files_" : [""],
+ "unknown text" : "teks tidak diketahui",
+ "Hello world!" : "Hello world!",
+ "sunny" : "cerah",
+ "Hello {name}, the weather is {weather}" : "Helo {name}, jepang {weather}",
+ "Hello {name}" : "Helo {name}",
+ "_download %n file_::_download %n files_" : ["unduh %n berkas"],
"Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
"Please reload the page." : "Silakan muat ulang halaman.",
+ "The update was unsuccessful. " : "Pembaruan tidak berhasil.",
"The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
"Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
"Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
@@ -120,21 +131,27 @@
"New password" : "Sandi baru",
"New Password" : "Sandi Baru",
"Reset password" : "Setel ulang sandi",
- "_{count} search result in other places_::_{count} search results in other places_" : [""],
+ "Searching other places" : "Mencari tempat lainnya",
+ "No search result in other places" : "Tidak ada hasil pencarian di tampat lainnya",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} hasil pencarian di tempat lain"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
"For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Tampaknya instansi %s berjalan di lingkungan PHP 32-bit dan open_basedir telah dikonfigurasi di php.ini. Hal ini akan menyebabkan masalah pada berkas lebih besar dari 4 GB dan sangat tidak disarankan.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Mohon hapus pengaturan open_basedir didalam php.ini atau beralih ke PHP 64-bit.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Nampaknya instansi %s berjalan di lingkungan PHP 32-bit dan cURL tidak diinstal. Hal ini akan menyebabkan masalah pada berkas lebih besar dari 4 GB dan sangat tidak disarankan.",
+ "Please install the cURL extension and restart your webserver." : "Mohon instal ekstensi cURL dan jalankan ulang server web.",
"Personal" : "Pribadi",
"Users" : "Pengguna",
"Apps" : "Aplikasi",
"Admin" : "Admin",
"Help" : "Bantuan",
- "Error loading tags" : "Galat saat memuat tag",
+ "Error loading tags" : "Kesalahan saat saat memuat tag",
"Tag already exists" : "Tag sudah ada",
- "Error deleting tag(s)" : "Galat saat menghapus tag",
- "Error tagging" : "Galat saat memberikan tag",
- "Error untagging" : "Galat saat menghapus tag",
- "Error favoriting" : "Galat saat memberikan sebagai favorit",
- "Error unfavoriting" : "Galat saat menghapus sebagai favorit",
+ "Error deleting tag(s)" : "Kesalahan saat menghapus tag",
+ "Error tagging" : "Kesalahan saat memberikan tag",
+ "Error untagging" : "Kesalahan saat menghapus tag",
+ "Error favoriting" : "Kesalahan saat memberikan sebagai favorit",
+ "Error unfavoriting" : "Kesalahan saat menghapus sebagai favorit",
"Access forbidden" : "Akses ditolak",
"File not found" : "Berkas tidak ditemukan",
"The specified document has not been found on the server." : "Dokumen yang diminta tidak tersedia pada server.",
@@ -170,7 +187,6 @@
"Database name" : "Nama basis data",
"Database tablespace" : "Tablespace basis data",
"Database host" : "Host basis data",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
"Finish setup" : "Selesaikan instalasi",
"Finishing …" : "Menyelesaikan ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index b526cef0c3d..e93105695da 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Nome del database",
"Database tablespace" : "Spazio delle tabelle del database",
"Database host" : "Host del database",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
+ "Performance Warning" : "Avviso di prestazioni",
+ "SQLite will be used as database." : "SQLite sarà utilizzato come database.",
+ "For larger installations we recommend to choose a different database backend." : "Per installazioni più grandi consigliamo di scegliere un motore di database diverso.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
"Finish setup" : "Termina configurazione",
"Finishing …" : "Completamento...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index fd54b18891b..a08ae280f34 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -187,7 +187,10 @@
"Database name" : "Nome del database",
"Database tablespace" : "Spazio delle tabelle del database",
"Database host" : "Host del database",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
+ "Performance Warning" : "Avviso di prestazioni",
+ "SQLite will be used as database." : "SQLite sarà utilizzato come database.",
+ "For larger installations we recommend to choose a different database backend." : "Per installazioni più grandi consigliamo di scegliere un motore di database diverso.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
"Finish setup" : "Termina configurazione",
"Finishing …" : "Completamento...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 6064f57efe3..caad1b3b675 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -4,7 +4,7 @@ OC.L10N.register(
"Couldn't send mail to following users: %s " : "次のユーザーにメールを送信できませんでした: %s",
"Turned on maintenance mode" : "メンテナンスモードがオンになりました",
"Turned off maintenance mode" : "メンテナンスモードがオフになりました",
- "Updated database" : "データベース更新完了",
+ "Updated database" : "データベース更新済み",
"Checked database schema update" : "指定データベースのスキーマを更新",
"Checked database schema update for apps" : "アプリの指定データベースのスキーマを更新",
"Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
@@ -134,9 +134,13 @@ OC.L10N.register(
"New Password" : "新しいパスワード",
"Reset password" : "パスワードをリセット",
"Searching other places" : "他の場所の検索",
- "_{count} search result in other places_::_{count} search results in other places_" : [""],
+ "No search result in other places" : "その他の場所の検索結果はありません",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["その他の場所 の検索件数 {count}"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
"For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いており、php.ini に open_basedir が設定されているようです。この環境は、4GB以上のファイルで問題を引き起こしますので利用を避けるべきです。",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "php.ini から open_basedir 設定を削除するか、64bit PHPに切り替えてください。",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いており、cURLがインストールされていないようです。この環境は4GB以上のファイルで問題を引き起こしますので利用を避けるべきです。",
"Please install the cURL extension and restart your webserver." : "cURL拡張をインストールして、WEBサーバーを再起動してください。",
"Personal" : "個人",
"Users" : "ユーザー",
@@ -185,10 +189,11 @@ OC.L10N.register(
"Database name" : "データベース名",
"Database tablespace" : "データベースの表領域",
"Database host" : "データベースのホスト名",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
+ "Performance Warning" : "パフォーマンス警告",
+ "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。",
"Finish setup" : "セットアップを完了します",
"Finishing …" : "作業を完了しています ...",
- "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
+ "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用するため、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
"%s is available. Get more information on how to update." : "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
"Log out" : "ログアウト",
"Search" : "検索",
@@ -212,7 +217,7 @@ OC.L10N.register(
"The theme %s has been disabled." : "テーマ %s が無効になっています。",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
"Start update" : "アップデートを開始",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性があるため、インストールディレクトリで次のコマンドを実行しても構いません。",
"This %s instance is currently being updated, which may take a while." : "このサーバー %s は現在更新中です。しばらくお待ちください。",
"This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
},
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index f261b6eabe9..aeebdb903b0 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -2,7 +2,7 @@
"Couldn't send mail to following users: %s " : "次のユーザーにメールを送信できませんでした: %s",
"Turned on maintenance mode" : "メンテナンスモードがオンになりました",
"Turned off maintenance mode" : "メンテナンスモードがオフになりました",
- "Updated database" : "データベース更新完了",
+ "Updated database" : "データベース更新済み",
"Checked database schema update" : "指定データベースのスキーマを更新",
"Checked database schema update for apps" : "アプリの指定データベースのスキーマを更新",
"Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
@@ -132,9 +132,13 @@
"New Password" : "新しいパスワード",
"Reset password" : "パスワードをリセット",
"Searching other places" : "他の場所の検索",
- "_{count} search result in other places_::_{count} search results in other places_" : [""],
+ "No search result in other places" : "その他の場所の検索結果はありません",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["その他の場所 の検索件数 {count}"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
"For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いており、php.ini に open_basedir が設定されているようです。この環境は、4GB以上のファイルで問題を引き起こしますので利用を避けるべきです。",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "php.ini から open_basedir 設定を削除するか、64bit PHPに切り替えてください。",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "このインスタンス %s は、32bit PHP 環境で動いており、cURLがインストールされていないようです。この環境は4GB以上のファイルで問題を引き起こしますので利用を避けるべきです。",
"Please install the cURL extension and restart your webserver." : "cURL拡張をインストールして、WEBサーバーを再起動してください。",
"Personal" : "個人",
"Users" : "ユーザー",
@@ -183,10 +187,11 @@
"Database name" : "データベース名",
"Database tablespace" : "データベースの表領域",
"Database host" : "データベースのホスト名",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
+ "Performance Warning" : "パフォーマンス警告",
+ "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。",
"Finish setup" : "セットアップを完了します",
"Finishing …" : "作業を完了しています ...",
- "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
+ "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用するため、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
"%s is available. Get more information on how to update." : "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
"Log out" : "ログアウト",
"Search" : "検索",
@@ -210,7 +215,7 @@
"The theme %s has been disabled." : "テーマ %s が無効になっています。",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
"Start update" : "アップデートを開始",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性があるため、インストールディレクトリで次のコマンドを実行しても構いません。",
"This %s instance is currently being updated, which may take a while." : "このサーバー %s は現在更新中です。しばらくお待ちください。",
"This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
},"pluralForm" :"nplurals=1; plural=0;"
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index 871fcb16d15..a9e0ec7d931 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "데이터베이스 이름",
"Database tablespace" : "데이터베이스 테이블 공간",
"Database host" : "데이터베이스 호스트",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite 데이터베이스를 사용합니다. 큰 규모의 파일을 관리하는 데에는 추천하지 않습니다.",
+ "Performance Warning" : "성능 경고",
+ "SQLite will be used as database." : "데이터베이스로 SQLite를 사용하게 됩니다.",
+ "For larger installations we recommend to choose a different database backend." : "대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드를 선택할 것을 권장합니다.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정일 때는, SQLite를 사용하지 않는 것이 좋습니다.",
"Finish setup" : "설치 완료",
"Finishing …" : "완료 중 ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "이 앱이 올바르게 작동하려면 JavaScript가 필요합니다. <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript를 활성화</a>한 다음 페이지를 새로 고치십시오.",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index cb5b431afa7..ab492825bbc 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -187,7 +187,10 @@
"Database name" : "데이터베이스 이름",
"Database tablespace" : "데이터베이스 테이블 공간",
"Database host" : "데이터베이스 호스트",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite 데이터베이스를 사용합니다. 큰 규모의 파일을 관리하는 데에는 추천하지 않습니다.",
+ "Performance Warning" : "성능 경고",
+ "SQLite will be used as database." : "데이터베이스로 SQLite를 사용하게 됩니다.",
+ "For larger installations we recommend to choose a different database backend." : "대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드를 선택할 것을 권장합니다.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정일 때는, SQLite를 사용하지 않는 것이 좋습니다.",
"Finish setup" : "설치 완료",
"Finishing …" : "완료 중 ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "이 앱이 올바르게 작동하려면 JavaScript가 필요합니다. <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript를 활성화</a>한 다음 페이지를 새로 고치십시오.",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index 1d655139a91..c93dcfd34aa 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -184,7 +184,7 @@ OC.L10N.register(
"Database name" : "Databasenavn",
"Database tablespace" : "Database tabellområde",
"Database host" : "Databasevert",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
"Finish setup" : "Fullfør oppsetting",
"Finishing …" : "Ferdigstiller ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index ce0292a2d86..ca32434efb2 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -182,7 +182,7 @@
"Database name" : "Databasenavn",
"Database tablespace" : "Database tabellområde",
"Database host" : "Databasevert",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
"Finish setup" : "Fullfør oppsetting",
"Finishing …" : "Ferdigstiller ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index ef512766cad..23e27c0def8 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Naam database",
"Database tablespace" : "Database tablespace",
"Database host" : "Databaseserver",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
+ "Performance Warning" : "Prestatiewaarschuwing",
+ "SQLite will be used as database." : "SQLite wordt gebruikt als database.",
+ "For larger installations we recommend to choose a different database backend." : "Voor grotere installaties adviseren we een andere database engine te kiezen.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
"Finish setup" : "Installatie afronden",
"Finishing …" : "Afronden ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index baaf58655f8..67d947bac55 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -187,7 +187,10 @@
"Database name" : "Naam database",
"Database tablespace" : "Database tablespace",
"Database host" : "Databaseserver",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
+ "Performance Warning" : "Prestatiewaarschuwing",
+ "SQLite will be used as database." : "SQLite wordt gebruikt als database.",
+ "For larger installations we recommend to choose a different database backend." : "Voor grotere installaties adviseren we een andere database engine te kiezen.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
"Finish setup" : "Installatie afronden",
"Finishing …" : "Afronden ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index c15eb0629e7..43e72d8d8a2 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -184,7 +184,6 @@ OC.L10N.register(
"Database name" : "Nazwa bazy danych",
"Database tablespace" : "Obszar tabel bazy danych",
"Database host" : "Komputer bazy danych",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
"Finish setup" : "Zakończ konfigurowanie",
"Finishing …" : "Kończę ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index fe3c2a10c6d..06426c7c484 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -182,7 +182,6 @@
"Database name" : "Nazwa bazy danych",
"Database tablespace" : "Obszar tabel bazy danych",
"Database host" : "Komputer bazy danych",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
"Finish setup" : "Zakończ konfigurowanie",
"Finishing …" : "Kończę ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 8129ccdf575..01c2d2b3694 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -189,7 +189,10 @@ OC.L10N.register(
"Database name" : "Nome do banco de dados",
"Database tablespace" : "Espaço de tabela do banco de dados",
"Database host" : "Host do banco de dados",
- "SQLite will be used as database. For larger installations we recommend to change this." : "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
+ "Performance Warning" : "Alerta de Desempenho",
+ "SQLite will be used as database." : "SQLite será usado como banco de dados",
+ "For larger installations we recommend to choose a different database backend." : "Para instalações maiores é recomendável escolher um backend de banco de dados diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
"Finish setup" : "Concluir configuração",
"Finishing …" : "Finalizando ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 570eb58e0f7..50bffab3a0c 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -187,7 +187,10 @@
"Database name" : "Nome do banco de dados",
"Database tablespace" : "Espaço de tabela do banco de dados",
"Database host" : "Host do banco de dados",
- "SQLite will be used as database. For larger installations we recommend to change this." : "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
+ "Performance Warning" : "Alerta de Desempenho",
+ "SQLite will be used as database." : "SQLite será usado como banco de dados",
+ "For larger installations we recommend to choose a different database backend." : "Para instalações maiores é recomendável escolher um backend de banco de dados diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
"Finish setup" : "Concluir configuração",
"Finishing …" : "Finalizando ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index bd728f75f71..80864aba78d 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -133,9 +133,14 @@ OC.L10N.register(
"New password" : "Nova palavra-chave",
"New Password" : "Nova palavra-passe",
"Reset password" : "Repor palavra-passe",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "Searching other places" : "A pesquisar noutros lugares",
+ "No search result in other places" : "Nenhum resultado de pesquisa noutros lugares",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de pesquisa noutros lugares","{count} resultados de pesquisa noutros lugares"],
"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.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que a instância %s está a ser executada num ambiente PHP de 32-bits e o open_basedir foi configurado no php.ini. Isto levará a problemas com ficheiros de tamanho superior a 4GB e é altamente desencorajado.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor, remova a definição open_basedir do seu php.ini ou altere o seu PHP para 64-bits.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que a instância %s está a ser executada num ambiente PHP de 32-bits e o cURL não está instalado. Isto levará a problemas com ficheiros de tamanho superior a 4GB e é altamente desencorajado.",
"Please install the cURL extension and restart your webserver." : "Por favor, instale a extensão cURL e reinicie o seu servidor da Web.",
"Personal" : "Pessoal",
"Users" : "Utilizadores",
@@ -184,7 +189,10 @@ OC.L10N.register(
"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.",
+ "Performance Warning" : "Aviso de Desempenho",
+ "SQLite will be used as database." : "SQLite será usado como base de dados.",
+ "For larger installations we recommend to choose a different database backend." : "Para instalações maiores recomendamos que escolha um tipo de base de dados diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
"Finish setup" : "Terminar consiguração",
"Finishing …" : "A terminar...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 1d4df24f8f0..4f5fdfaa0fc 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -131,9 +131,14 @@
"New password" : "Nova palavra-chave",
"New Password" : "Nova palavra-passe",
"Reset password" : "Repor palavra-passe",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "Searching other places" : "A pesquisar noutros lugares",
+ "No search result in other places" : "Nenhum resultado de pesquisa noutros lugares",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de pesquisa noutros lugares","{count} resultados de pesquisa noutros lugares"],
"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.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que a instância %s está a ser executada num ambiente PHP de 32-bits e o open_basedir foi configurado no php.ini. Isto levará a problemas com ficheiros de tamanho superior a 4GB e é altamente desencorajado.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor, remova a definição open_basedir do seu php.ini ou altere o seu PHP para 64-bits.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Parece que a instância %s está a ser executada num ambiente PHP de 32-bits e o cURL não está instalado. Isto levará a problemas com ficheiros de tamanho superior a 4GB e é altamente desencorajado.",
"Please install the cURL extension and restart your webserver." : "Por favor, instale a extensão cURL e reinicie o seu servidor da Web.",
"Personal" : "Pessoal",
"Users" : "Utilizadores",
@@ -182,7 +187,10 @@
"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.",
+ "Performance Warning" : "Aviso de Desempenho",
+ "SQLite will be used as database." : "SQLite será usado como base de dados.",
+ "For larger installations we recommend to choose a different database backend." : "Para instalações maiores recomendamos que escolha um tipo de base de dados diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
"Finish setup" : "Terminar consiguração",
"Finishing …" : "A terminar...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 54edb58d72d..044f78ecec9 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -36,7 +36,7 @@ OC.L10N.register(
"Settings" : "Настройки",
"Saving..." : "Сохранение...",
"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." : "Ссылка восстановления пароля отправлена на ваш email. Если вы не получили письмо в течении продолжительного промежутка времени, проверьте папку спама.<br>Если письмо с ссылкой восстановления пароля папке спама не обнаружено, обратитесь к вашему администратору.",
+ "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." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку спама.<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" : "Я понимаю, что делаю",
"Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
@@ -55,8 +55,8 @@ OC.L10N.register(
"If you select both versions, the copied file will have a number added to its name." : "При выборе обеих версий, к названию копируемого файла будет добавлена цифра",
"Cancel" : "Отмена",
"Continue" : "Продолжить",
- "(all selected)" : "(все)",
- "({count} selected)" : "({count} выбрано)",
+ "(all selected)" : "(все выбранные)",
+ "({count} selected)" : "({count} выбранных)",
"Error loading file exists template" : "Ошибка при загрузке шаблона существующего файла",
"Very weak password" : "Очень слабый пароль",
"Weak password" : "Слабый пароль",
@@ -65,7 +65,7 @@ OC.L10N.register(
"Strong password" : "Устойчивый к взлому пароль",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
"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." : "Данный сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение удаленных дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если вы хотите использовать все возможности.",
- "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." : "Похоже, что каталог с данными и файлы доступны из интернета. Файл .htaccess не работает. Крайне рекомендуется сконфигурировать вебсервер таким образом, чтобы каталог с данными более не был доступен, или переместите каталог с данными в другое место, за пределами каталога документов веб-сервера.",
+ "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." : "Похоже, что каталог с данными и файлами доступны из интернета. Файл .htaccess не работает. Крайне рекомендуется произвести настройку вебсервера таким образом, чтобы каталог с данными больше не был доступен, или переместите каталог с данными в другое место, за пределы каталога документов веб-сервера.",
"Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера",
"Shared" : "Общий доступ",
"Shared with {recipients}" : "Вы поделились с {recipients}",
@@ -86,7 +86,7 @@ OC.L10N.register(
"Allow editing" : "Разрешить редактирование",
"Email link to person" : "Отправить ссылку по электронной почте",
"Send" : "Отправить",
- "Set expiration date" : "Установить срок доступа",
+ "Set expiration date" : "Установить срок действия",
"Expiration" : "Срок действия",
"Expiration date" : "Дата окончания",
"Adding user..." : "Добавляем пользователя...",
@@ -125,10 +125,10 @@ OC.L10N.register(
"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 сброс пароля",
+ "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}",
"New password" : "Новый пароль",
"New Password" : "Новый пароль",
@@ -138,14 +138,14 @@ OC.L10N.register(
"_{count} search result in other places_::_{count} search results in other places_" : ["{count} результат поиска в других местах","{count} результата поиска в других местах","{count} результатов поиска в других местах"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s может работать некорректно на данной платформе. Используйте на свой страх и риск!",
"For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, рассмотрите вариант использования сервера на GNU/Linux.",
- "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Судя по всему, экземпляр %s работает на 32х разрядной сборке PHP и указаной в php.ini директивой open_basedir. Такая конфигурация приведет к проблемам работы с файлами размером более 4GB и крайне не рекомендуется.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Судя по всему, экземпляр %s работает на 32х разрядной сборке PHP и указанной в php.ini директивой open_basedir. Такая конфигурация приведет к проблемам работы с файлами размером более 4GB и крайне не рекомендуется.",
"Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Удалите директиву open_basedir из файла php.ini или смените PHP на 64х разрядную сборку.",
"It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Судя по всему, на сервере не установлен cURL и экземпляр %s работает на 32х разрядной сборке PHP. Такая конфигурация приведет к проблемам работы с файлами размером более 4GB и крайне не рекомендуется.",
"Please install the cURL extension and restart your webserver." : "Установите расширение cURL и перезапустите веб-сервер.",
"Personal" : "Личное",
"Users" : "Пользователи",
"Apps" : "Приложения",
- "Admin" : "Админпанель",
+ "Admin" : "Администрирование",
"Help" : "Помощь",
"Error loading tags" : "Ошибка загрузки меток",
"Tag already exists" : "Метка уже существует",
@@ -180,20 +180,20 @@ OC.L10N.register(
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, руководствуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.",
"Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
"Username" : "Имя пользователя",
- "Storage & database" : "Система хранения данных & база данных",
+ "Storage & database" : "Хранилище и база данных",
"Data folder" : "Каталог с данными",
"Configure the database" : "Настройка базы данных",
- "Only %s is available." : "Только %s доступно.",
+ "Only %s is available." : "Доступен только %s.",
"Database user" : "Пользователь базы данных",
"Database password" : "Пароль базы данных",
"Database name" : "Название базы данных",
"Database tablespace" : "Табличое пространство базы данных",
"Database host" : "Хост базы данных",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
"Finish setup" : "Завершить установку",
- "Finishing …" : "Завершаем...",
+ "Finishing …" : "Завершение...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для нормальной работы приложения требуется JavaScript. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите JavaScript</a> в вашем браузере и обновите страницу.",
- "%s is available. Get more information on how to update." : "%s доступно. Получить дополнительную информацию о порядке обновления.",
+ "%s is available. Get more information on how to update." : "Доступна версия %s. Получить дополнительную информацию о порядке обновления.",
"Log out" : "Выйти",
"Search" : "Найти",
"Server side authentication failed!" : "Неудачная аутентификация с сервером!",
@@ -208,16 +208,16 @@ OC.L10N.register(
"Contact your system administrator if this message persists or appeared unexpectedly." : "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
"Thank you for your patience." : "Спасибо за терпение.",
"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.",
- "Depending on your configuration, as an administrator you might also be able to use the button below to trust this 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.",
+ "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.",
"Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
- "%s will be updated to version %s." : "%s будет обновлено до версии %s.",
+ "%s will be updated to version %s." : "%s будет обновлен до версии %s.",
"The following apps will be disabled:" : "Следующие приложения будут отключены:",
"The theme %s has been disabled." : "Тема %s была отключена.",
- "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
+ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
"Start update" : "Запустить обновление",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в каталоге установки:",
- "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек в крупных установках, вы можете выполнить следующую команду в каталоге установки:",
+ "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется. Это может занять некоторое время.",
"This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s снова станет доступен."
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 9e5d65a5dc6..93fd051fa28 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -34,7 +34,7 @@
"Settings" : "Настройки",
"Saving..." : "Сохранение...",
"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." : "Ссылка восстановления пароля отправлена на ваш email. Если вы не получили письмо в течении продолжительного промежутка времени, проверьте папку спама.<br>Если письмо с ссылкой восстановления пароля папке спама не обнаружено, обратитесь к вашему администратору.",
+ "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." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку спама.<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" : "Я понимаю, что делаю",
"Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
@@ -53,8 +53,8 @@
"If you select both versions, the copied file will have a number added to its name." : "При выборе обеих версий, к названию копируемого файла будет добавлена цифра",
"Cancel" : "Отмена",
"Continue" : "Продолжить",
- "(all selected)" : "(все)",
- "({count} selected)" : "({count} выбрано)",
+ "(all selected)" : "(все выбранные)",
+ "({count} selected)" : "({count} выбранных)",
"Error loading file exists template" : "Ошибка при загрузке шаблона существующего файла",
"Very weak password" : "Очень слабый пароль",
"Weak password" : "Слабый пароль",
@@ -63,7 +63,7 @@
"Strong password" : "Устойчивый к взлому пароль",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
"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." : "Данный сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение удаленных дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если вы хотите использовать все возможности.",
- "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." : "Похоже, что каталог с данными и файлы доступны из интернета. Файл .htaccess не работает. Крайне рекомендуется сконфигурировать вебсервер таким образом, чтобы каталог с данными более не был доступен, или переместите каталог с данными в другое место, за пределами каталога документов веб-сервера.",
+ "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." : "Похоже, что каталог с данными и файлами доступны из интернета. Файл .htaccess не работает. Крайне рекомендуется произвести настройку вебсервера таким образом, чтобы каталог с данными больше не был доступен, или переместите каталог с данными в другое место, за пределы каталога документов веб-сервера.",
"Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера",
"Shared" : "Общий доступ",
"Shared with {recipients}" : "Вы поделились с {recipients}",
@@ -84,7 +84,7 @@
"Allow editing" : "Разрешить редактирование",
"Email link to person" : "Отправить ссылку по электронной почте",
"Send" : "Отправить",
- "Set expiration date" : "Установить срок доступа",
+ "Set expiration date" : "Установить срок действия",
"Expiration" : "Срок действия",
"Expiration date" : "Дата окончания",
"Adding user..." : "Добавляем пользователя...",
@@ -123,10 +123,10 @@
"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 сброс пароля",
+ "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}",
"New password" : "Новый пароль",
"New Password" : "Новый пароль",
@@ -136,14 +136,14 @@
"_{count} search result in other places_::_{count} search results in other places_" : ["{count} результат поиска в других местах","{count} результата поиска в других местах","{count} результатов поиска в других местах"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s может работать некорректно на данной платформе. Используйте на свой страх и риск!",
"For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, рассмотрите вариант использования сервера на GNU/Linux.",
- "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Судя по всему, экземпляр %s работает на 32х разрядной сборке PHP и указаной в php.ini директивой open_basedir. Такая конфигурация приведет к проблемам работы с файлами размером более 4GB и крайне не рекомендуется.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Судя по всему, экземпляр %s работает на 32х разрядной сборке PHP и указанной в php.ini директивой open_basedir. Такая конфигурация приведет к проблемам работы с файлами размером более 4GB и крайне не рекомендуется.",
"Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Удалите директиву open_basedir из файла php.ini или смените PHP на 64х разрядную сборку.",
"It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Судя по всему, на сервере не установлен cURL и экземпляр %s работает на 32х разрядной сборке PHP. Такая конфигурация приведет к проблемам работы с файлами размером более 4GB и крайне не рекомендуется.",
"Please install the cURL extension and restart your webserver." : "Установите расширение cURL и перезапустите веб-сервер.",
"Personal" : "Личное",
"Users" : "Пользователи",
"Apps" : "Приложения",
- "Admin" : "Админпанель",
+ "Admin" : "Администрирование",
"Help" : "Помощь",
"Error loading tags" : "Ошибка загрузки меток",
"Tag already exists" : "Метка уже существует",
@@ -178,20 +178,20 @@
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, руководствуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.",
"Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
"Username" : "Имя пользователя",
- "Storage & database" : "Система хранения данных & база данных",
+ "Storage & database" : "Хранилище и база данных",
"Data folder" : "Каталог с данными",
"Configure the database" : "Настройка базы данных",
- "Only %s is available." : "Только %s доступно.",
+ "Only %s is available." : "Доступен только %s.",
"Database user" : "Пользователь базы данных",
"Database password" : "Пароль базы данных",
"Database name" : "Название базы данных",
"Database tablespace" : "Табличое пространство базы данных",
"Database host" : "Хост базы данных",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
"Finish setup" : "Завершить установку",
- "Finishing …" : "Завершаем...",
+ "Finishing …" : "Завершение...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для нормальной работы приложения требуется JavaScript. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите JavaScript</a> в вашем браузере и обновите страницу.",
- "%s is available. Get more information on how to update." : "%s доступно. Получить дополнительную информацию о порядке обновления.",
+ "%s is available. Get more information on how to update." : "Доступна версия %s. Получить дополнительную информацию о порядке обновления.",
"Log out" : "Выйти",
"Search" : "Найти",
"Server side authentication failed!" : "Неудачная аутентификация с сервером!",
@@ -206,16 +206,16 @@
"Contact your system administrator if this message persists or appeared unexpectedly." : "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
"Thank you for your patience." : "Спасибо за терпение.",
"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.",
- "Depending on your configuration, as an administrator you might also be able to use the button below to trust this 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.",
+ "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.",
"Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
- "%s will be updated to version %s." : "%s будет обновлено до версии %s.",
+ "%s will be updated to version %s." : "%s будет обновлен до версии %s.",
"The following apps will be disabled:" : "Следующие приложения будут отключены:",
"The theme %s has been disabled." : "Тема %s была отключена.",
- "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
+ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
"Start update" : "Запустить обновление",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в каталоге установки:",
- "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек в крупных установках, вы можете выполнить следующую команду в каталоге установки:",
+ "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется. Это может занять некоторое время.",
"This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s снова станет доступен."
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 290befa2675..81e82f331b0 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -83,14 +83,15 @@ OC.L10N.register(
"Password protect" : "Chrániť heslom",
"Password" : "Heslo",
"Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
- "Allow editing" : "Povoliť upravovanie",
+ "Allow editing" : "Povoliť úpravy",
"Email link to person" : "Odoslať odkaz emailom",
"Send" : "Odoslať",
"Set expiration date" : "Nastaviť dátum expirácie",
- "Expiration" : "Uplynutie",
+ "Expiration" : "Koniec platnosti",
"Expiration date" : "Dátum expirácie",
"Adding user..." : "Pridávam používateľa...",
"group" : "skupina",
+ "remote" : "vzdialený",
"Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
"Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
"Unshare" : "Zrušiť zdieľanie",
@@ -118,6 +119,7 @@ OC.L10N.register(
"Hello world!" : "Ahoj svet!",
"sunny" : "slnečno",
"Hello {name}, the weather is {weather}" : "Dobrý deň {name}, počasie je {weather}",
+ "Hello {name}" : "Vitaj {name}",
"_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
"Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
"Please reload the page." : "Obnovte prosím stránku.",
@@ -131,9 +133,15 @@ OC.L10N.register(
"New password" : "Nové heslo",
"New Password" : "Nové heslo",
"Reset password" : "Obnovenie hesla",
- "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
+ "Searching other places" : "Prehľadanie ostatných umiestnení",
+ "No search result in other places" : "Žiadne výsledky z prehľadávania ostatných umiestnení",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} výsledok v ostatných umiestneniach","{count} výsledky v ostatných umiestneniach","{count} výsledkov v ostatných umiestneniach"],
"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 je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
"For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Zdá sa, že táto %s inštancia je spustená v 32-bitovom PHP prostredí a open_basedir bol nastavený v php.ini. To bude zdrojom problémov so súbormi väčšími ako 4GB a dôrazne sa neodporúča.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Prosím, odstráňte nastavenie open_basedir vo vašom php.ini alebo prejdite na 64-bit PHP.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Zdá sa, že táto %s inštancia je spustená v 32-bitovom PHP prostredie a cURL nie je nainštalovaná. To bude zdrojom problémov so súbormi väčšími ako 4GB a dôrazne sa neodporúča.",
+ "Please install the cURL extension and restart your webserver." : "Nainštalujte si prosím cURL rozšírenie a reštartujte webserver.",
"Personal" : "Osobné",
"Users" : "Používatelia",
"Apps" : "Aplikácie",
@@ -148,10 +156,14 @@ OC.L10N.register(
"Error unfavoriting" : "Chyba pri odobratí z obľúbených",
"Access forbidden" : "Prístup odmietnutý",
"File not found" : "Súbor nenájdený",
+ "The specified document has not been found on the server." : "Zadaný dokument nebol nájdený na serveri.",
+ "You can click here to return to %s." : "Kliknite tu pre návrat do %s.",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
"The share will expire on %s." : "Zdieľanie vyprší %s.",
"Cheers!" : "Pekný deň!",
"Internal Server Error" : "Vnútorná chyba servera",
+ "The server encountered an internal error and was unable to complete your request." : "Na serveri došlo k vnútornej chybe a nebol schopný dokončiť vašu požiadavku.",
+ "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Obráťte sa na správcu servera, ak sa táto chyba objaví znovu viackrát, uveďte nižšie zobrazené technické údaje vo svojej správe.",
"More details can be found in the server log." : "Viac nájdete v logu servera.",
"Technical details" : "Technické podrobnosti",
"Remote Address: %s" : "Vzdialená adresa: %s",
@@ -177,7 +189,6 @@ OC.L10N.register(
"Database name" : "Meno databázy",
"Database tablespace" : "Tabuľkový priestor databázy",
"Database host" : "Server databázy",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
"Finish setup" : "Dokončiť inštaláciu",
"Finishing …" : "Dokončujem...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Táto aplikácia potrebuje JavaScript pre správne fungovanie. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">zapnite si JavaScript</a> a obnovte stránku",
@@ -196,12 +207,16 @@ OC.L10N.register(
"Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
"Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
"You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
- "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." : "Kontaktujte administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+ "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." : "Kontaktujte správcu. Ak ste správcom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+ "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na konfigurácii, vám môže byť ako správcovi umožnené použitie tlačidla nižšie pre označenie tejto domény ako dôveryhodnej.",
"Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
"%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
"The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
"The theme %s has been disabled." : "Téma %s bola zakázaná.",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
- "Start update" : "Spustiť aktualizáciu"
+ "Start update" : "Spustiť aktualizáciu",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby nedošlo k vypršaniu časového limitu vo väčších inštaláciách, môžete namiesto toho použiť nasledujúci príkaz z inštalačného priečinka:",
+ "This %s instance is currently being updated, which may take a while." : "Tento %s inštancia sa v súčasnej dobe aktualizuje. Počkajte prosím.",
+ "This page will refresh itself when the %s instance is available again." : "Táto stránka sa obnoví sama hneď ako bude %s inštancia znovu dostupná."
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index 75a7263f977..903de55ee4a 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -81,14 +81,15 @@
"Password protect" : "Chrániť heslom",
"Password" : "Heslo",
"Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
- "Allow editing" : "Povoliť upravovanie",
+ "Allow editing" : "Povoliť úpravy",
"Email link to person" : "Odoslať odkaz emailom",
"Send" : "Odoslať",
"Set expiration date" : "Nastaviť dátum expirácie",
- "Expiration" : "Uplynutie",
+ "Expiration" : "Koniec platnosti",
"Expiration date" : "Dátum expirácie",
"Adding user..." : "Pridávam používateľa...",
"group" : "skupina",
+ "remote" : "vzdialený",
"Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
"Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
"Unshare" : "Zrušiť zdieľanie",
@@ -116,6 +117,7 @@
"Hello world!" : "Ahoj svet!",
"sunny" : "slnečno",
"Hello {name}, the weather is {weather}" : "Dobrý deň {name}, počasie je {weather}",
+ "Hello {name}" : "Vitaj {name}",
"_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
"Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
"Please reload the page." : "Obnovte prosím stránku.",
@@ -129,9 +131,15 @@
"New password" : "Nové heslo",
"New Password" : "Nové heslo",
"Reset password" : "Obnovenie hesla",
- "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
+ "Searching other places" : "Prehľadanie ostatných umiestnení",
+ "No search result in other places" : "Žiadne výsledky z prehľadávania ostatných umiestnení",
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} výsledok v ostatných umiestneniach","{count} výsledky v ostatných umiestneniach","{count} výsledkov v ostatných umiestneniach"],
"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 je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
"For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4GB and is highly discouraged." : "Zdá sa, že táto %s inštancia je spustená v 32-bitovom PHP prostredí a open_basedir bol nastavený v php.ini. To bude zdrojom problémov so súbormi väčšími ako 4GB a dôrazne sa neodporúča.",
+ "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Prosím, odstráňte nastavenie open_basedir vo vašom php.ini alebo prejdite na 64-bit PHP.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. This will lead to problems with files over 4GB and is highly discouraged." : "Zdá sa, že táto %s inštancia je spustená v 32-bitovom PHP prostredie a cURL nie je nainštalovaná. To bude zdrojom problémov so súbormi väčšími ako 4GB a dôrazne sa neodporúča.",
+ "Please install the cURL extension and restart your webserver." : "Nainštalujte si prosím cURL rozšírenie a reštartujte webserver.",
"Personal" : "Osobné",
"Users" : "Používatelia",
"Apps" : "Aplikácie",
@@ -146,10 +154,14 @@
"Error unfavoriting" : "Chyba pri odobratí z obľúbených",
"Access forbidden" : "Prístup odmietnutý",
"File not found" : "Súbor nenájdený",
+ "The specified document has not been found on the server." : "Zadaný dokument nebol nájdený na serveri.",
+ "You can click here to return to %s." : "Kliknite tu pre návrat do %s.",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
"The share will expire on %s." : "Zdieľanie vyprší %s.",
"Cheers!" : "Pekný deň!",
"Internal Server Error" : "Vnútorná chyba servera",
+ "The server encountered an internal error and was unable to complete your request." : "Na serveri došlo k vnútornej chybe a nebol schopný dokončiť vašu požiadavku.",
+ "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Obráťte sa na správcu servera, ak sa táto chyba objaví znovu viackrát, uveďte nižšie zobrazené technické údaje vo svojej správe.",
"More details can be found in the server log." : "Viac nájdete v logu servera.",
"Technical details" : "Technické podrobnosti",
"Remote Address: %s" : "Vzdialená adresa: %s",
@@ -175,7 +187,6 @@
"Database name" : "Meno databázy",
"Database tablespace" : "Tabuľkový priestor databázy",
"Database host" : "Server databázy",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
"Finish setup" : "Dokončiť inštaláciu",
"Finishing …" : "Dokončujem...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Táto aplikácia potrebuje JavaScript pre správne fungovanie. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">zapnite si JavaScript</a> a obnovte stránku",
@@ -194,12 +205,16 @@
"Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
"Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
"You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
- "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." : "Kontaktujte administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+ "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." : "Kontaktujte správcu. Ak ste správcom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+ "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na konfigurácii, vám môže byť ako správcovi umožnené použitie tlačidla nižšie pre označenie tejto domény ako dôveryhodnej.",
"Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
"%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
"The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
"The theme %s has been disabled." : "Téma %s bola zakázaná.",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
- "Start update" : "Spustiť aktualizáciu"
+ "Start update" : "Spustiť aktualizáciu",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby nedošlo k vypršaniu časového limitu vo väčších inštaláciách, môžete namiesto toho použiť nasledujúci príkaz z inštalačného priečinka:",
+ "This %s instance is currently being updated, which may take a while." : "Tento %s inštancia sa v súčasnej dobe aktualizuje. Počkajte prosím.",
+ "This page will refresh itself when the %s instance is available again." : "Táto stránka sa obnoví sama hneď ako bude %s inštancia znovu dostupná."
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
} \ No newline at end of file
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 15960869d6f..0c11b802994 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -186,7 +186,6 @@ OC.L10N.register(
"Database name" : "Ime podatkovne zbirke",
"Database tablespace" : "Razpredelnica podatkovne zbirke",
"Database host" : "Gostitelj podatkovne zbirke",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
"Finish setup" : "Končaj nastavitev",
"Finishing …" : "Poteka zaključevanje opravila ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index d530bde877c..b72616f6e6b 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -184,7 +184,6 @@
"Database name" : "Ime podatkovne zbirke",
"Database tablespace" : "Razpredelnica podatkovne zbirke",
"Database host" : "Gostitelj podatkovne zbirke",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
"Finish setup" : "Končaj nastavitev",
"Finishing …" : "Poteka zaključevanje opravila ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 2aed9edd028..7e82b8ed9af 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -175,7 +175,6 @@ OC.L10N.register(
"Database name" : "Emri i database-it",
"Database tablespace" : "Tablespace-i i database-it",
"Database host" : "Pozicioni (host) i database-it",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite do të përdoret si bazë të dhënash. Për instalime më të mëdha ju rekomandojmë që ta ndryshoni këtë.",
"Finish setup" : "Mbaro setup-in",
"Finishing …" : "Duke përfunduar ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Këtij aplikacioni i nevojitet JavaScript për funksionim të rregullt. Ju lutem <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivizoni JavaScript</a> dhe ringarkoni faqen.",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index ccbf085df42..2d451464593 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -173,7 +173,6 @@
"Database name" : "Emri i database-it",
"Database tablespace" : "Tablespace-i i database-it",
"Database host" : "Pozicioni (host) i database-it",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite do të përdoret si bazë të dhënash. Për instalime më të mëdha ju rekomandojmë që ta ndryshoni këtë.",
"Finish setup" : "Mbaro setup-in",
"Finishing …" : "Duke përfunduar ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Këtij aplikacioni i nevojitet JavaScript për funksionim të rregullt. Ju lutem <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivizoni JavaScript</a> dhe ringarkoni faqen.",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 6ebe48f85e7..78ba9005875 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -183,7 +183,6 @@ OC.L10N.register(
"Database name" : "Ime baze",
"Database tablespace" : "tablespace baze",
"Database host" : "Domaćin baze",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da promenite ovo.",
"Finish setup" : "Završi podešavanje",
"Finishing …" : "Završavam ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahteva JavaScript za pravilan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> omogućite JavaScript</a> i ponovo učitajte stranu.",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index 53824d1d63b..a9503c1972c 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -181,7 +181,6 @@
"Database name" : "Ime baze",
"Database tablespace" : "tablespace baze",
"Database host" : "Domaćin baze",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da promenite ovo.",
"Finish setup" : "Završi podešavanje",
"Finishing …" : "Završavam ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahteva JavaScript za pravilan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> omogućite JavaScript</a> i ponovo učitajte stranu.",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 8b933a94a18..9961379f128 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -119,6 +119,7 @@ OC.L10N.register(
"Hello world!" : "Hej värld!",
"sunny" : "soligt",
"Hello {name}, the weather is {weather}" : "Hej {name}, vädret är {weather}",
+ "Hello {name}" : "Hej {name}",
"_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"],
"Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
"Please reload the page." : "Vänligen ladda om sidan.",
@@ -132,7 +133,7 @@ OC.L10N.register(
"New password" : "Nytt lösenord",
"New Password" : "Nytt lösenord",
"Reset password" : "Återställ lösenordet",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} sökresultat på andra platser","{count} sökresultat på andra platser"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
"For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
"Please install the cURL extension and restart your webserver." : "Vänligen installera tillägget cURL och starta om din webbserver.",
@@ -183,7 +184,6 @@ OC.L10N.register(
"Database name" : "Databasnamn",
"Database tablespace" : "Databas tabellutrymme",
"Database host" : "Databasserver",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
"Finish setup" : "Avsluta installation",
"Finishing …" : "Avslutar ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denna applikation kräver JavaScript för att fungera korrekt. Vänligen <a href=\"http://enable-javascript.com/\" target=\"_blank\">slå på JavaScript</a> och ladda om denna sidan.",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index c331c504d63..090ca0fb592 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -117,6 +117,7 @@
"Hello world!" : "Hej värld!",
"sunny" : "soligt",
"Hello {name}, the weather is {weather}" : "Hej {name}, vädret är {weather}",
+ "Hello {name}" : "Hej {name}",
"_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"],
"Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
"Please reload the page." : "Vänligen ladda om sidan.",
@@ -130,7 +131,7 @@
"New password" : "Nytt lösenord",
"New Password" : "Nytt lösenord",
"Reset password" : "Återställ lösenordet",
- "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
+ "_{count} search result in other places_::_{count} search results in other places_" : ["{count} sökresultat på andra platser","{count} sökresultat på andra platser"],
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
"For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
"Please install the cURL extension and restart your webserver." : "Vänligen installera tillägget cURL och starta om din webbserver.",
@@ -181,7 +182,6 @@
"Database name" : "Databasnamn",
"Database tablespace" : "Databas tabellutrymme",
"Database host" : "Databasserver",
- "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
"Finish setup" : "Avsluta installation",
"Finishing …" : "Avslutar ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denna applikation kräver JavaScript för att fungera korrekt. Vänligen <a href=\"http://enable-javascript.com/\" target=\"_blank\">slå på JavaScript</a> och ladda om denna sidan.",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 66d7a8fbbb9..0df579dc34d 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -189,7 +189,9 @@ OC.L10N.register(
"Database name" : "Veritabanı adı",
"Database tablespace" : "Veritabanı tablo alanı",
"Database host" : "Veritabanı sunucusu",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
+ "Performance Warning" : "Performans Uyarısı",
+ "SQLite will be used as database." : "Veritabanı olarak SQLite kullanılacak",
+ "For larger installations we recommend to choose a different database backend." : "Daha büyük kurulumlar için farklı bir veritabanı öneriyoruz",
"Finish setup" : "Kurulumu tamamla",
"Finishing …" : "Tamamlanıyor ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index fb12f3548af..ff32e88baa5 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -187,7 +187,9 @@
"Database name" : "Veritabanı adı",
"Database tablespace" : "Veritabanı tablo alanı",
"Database host" : "Veritabanı sunucusu",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
+ "Performance Warning" : "Performans Uyarısı",
+ "SQLite will be used as database." : "Veritabanı olarak SQLite kullanılacak",
+ "For larger installations we recommend to choose a different database backend." : "Daha büyük kurulumlar için farklı bir veritabanı öneriyoruz",
"Finish setup" : "Kurulumu tamamla",
"Finishing …" : "Tamamlanıyor ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 325defb01ed..7041ec4fa96 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -187,7 +187,6 @@ OC.L10N.register(
"Database name" : "Назва бази даних",
"Database tablespace" : "Таблиця бази даних",
"Database host" : "Хост бази даних",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
"Finish setup" : "Завершити налаштування",
"Finishing …" : "Завершується ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index ffa60ad891d..b1e50c95523 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -185,7 +185,6 @@
"Database name" : "Назва бази даних",
"Database tablespace" : "Таблиця бази даних",
"Database host" : "Хост бази даних",
- "SQLite will be used as database. For larger installations we recommend to change this." : "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
"Finish setup" : "Завершити налаштування",
"Finishing …" : "Завершується ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 2f885f45ce4..18d92594d3c 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -83,6 +83,7 @@ OC.L10N.register(
"Password protect" : "密码保护",
"Password" : "密码",
"Choose a password for the public link" : "为共享链接设置密码",
+ "Allow editing" : "允许编辑",
"Email link to person" : "发送链接到个人",
"Send" : "发送",
"Set expiration date" : "设置过期日期",
@@ -90,6 +91,7 @@ OC.L10N.register(
"Expiration date" : "过期日期",
"Adding user..." : "添加用户中...",
"group" : "群组",
+ "remote" : "远程",
"Resharing is not allowed" : "不允许二次共享",
"Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
"Unshare" : "取消共享",
@@ -180,7 +182,6 @@ OC.L10N.register(
"Database name" : "数据库名",
"Database tablespace" : "数据库表空间",
"Database host" : "数据库主机",
- "SQLite will be used as database. For larger installations we recommend to change this." : "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
"Finish setup" : "安装完成",
"Finishing …" : "正在结束 ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 2b2567816ef..dbe929b4b86 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -81,6 +81,7 @@
"Password protect" : "密码保护",
"Password" : "密码",
"Choose a password for the public link" : "为共享链接设置密码",
+ "Allow editing" : "允许编辑",
"Email link to person" : "发送链接到个人",
"Send" : "发送",
"Set expiration date" : "设置过期日期",
@@ -88,6 +89,7 @@
"Expiration date" : "过期日期",
"Adding user..." : "添加用户中...",
"group" : "群组",
+ "remote" : "远程",
"Resharing is not allowed" : "不允许二次共享",
"Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
"Unshare" : "取消共享",
@@ -178,7 +180,6 @@
"Database name" : "数据库名",
"Database tablespace" : "数据库表空间",
"Database host" : "数据库主机",
- "SQLite will be used as database. For larger installations we recommend to change this." : "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
"Finish setup" : "安装完成",
"Finishing …" : "正在结束 ...",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 9711bda4f60..223d3b4acba 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -171,7 +171,6 @@ OC.L10N.register(
"Database name" : "資料庫名稱",
"Database tablespace" : "資料庫 tablespace",
"Database host" : "資料庫主機",
- "SQLite will be used as database. For larger installations we recommend to change this." : "將會使用 SQLite 作為資料庫,在大型安裝中建議使用其他種資料庫",
"Finish setup" : "完成設定",
"Finishing …" : "即將完成…",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "這個應用程式需要 Javascript 才能正常運作,請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index a715be5e589..f4c7fc2a0b1 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -169,7 +169,6 @@
"Database name" : "資料庫名稱",
"Database tablespace" : "資料庫 tablespace",
"Database host" : "資料庫主機",
- "SQLite will be used as database. For larger installations we recommend to change this." : "將會使用 SQLite 作為資料庫,在大型安裝中建議使用其他種資料庫",
"Finish setup" : "完成設定",
"Finishing …" : "即將完成…",
"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "這個應用程式需要 Javascript 才能正常運作,請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index aee4001ed37..c039c578b59 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -141,14 +141,14 @@ class LostController extends Controller {
* @return array
*/
public function setPassword($token, $userId, $password, $proceed) {
- if ($this->isDataEncrypted && !$proceed){
+ if ($this->isDataEncrypted && !$proceed) {
return $this->error('', array('encryption' => true));
}
try {
$user = $this->userManager->get($userId);
- if (!StringUtils::equals($this->config->getUserValue($userId, 'owncloud', 'lostpassword'), $token)) {
+ if (!StringUtils::equals($this->config->getUserValue($userId, 'owncloud', 'lostpassword', null), $token)) {
throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
}
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 144359a16d9..e5b57e2645e 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -1,6 +1,8 @@
<?php
/** @var array $_ */
/** @var OC_L10N $l */
+
+style('core', ['styles', 'header']);
?>
<span class="error error-wide">
<h2><strong><?php p($l->t('Internal Server Error')) ?></strong></h2>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 0b3b0d46c5c..53ab4a0b877 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -154,7 +154,12 @@ script('core', [
<?php endif; ?>
<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
- <p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>
+ <fieldset id="sqliteInformation" class="warning">
+ <legend><?php p($l->t('Performance Warning'));?></legend>
+ <p><?php p($l->t('SQLite will be used as database.'));?></p>
+ <p><?php p($l->t('For larger installations we recommend to choose a different database backend.'));?></p>
+ <p><?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?></p>
+ </fieldset>
<?php endif ?>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 96229fd370a..aeebc2d6439 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -13,8 +13,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
- <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
- <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+ <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
+ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
<?php foreach ($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index c799205b7cf..c1a75447210 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -14,8 +14,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
- <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
- <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+ <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
+ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4ffec917c9b..ffa5e557c64 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -21,8 +21,8 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:'ownCloud'); ?>">
<meta name="mobile-web-app-capable" content="yes">
- <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
- <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+ <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
+ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
<?php endforeach; ?>
diff --git a/index.php b/index.php
index 88d5733cb37..1ab350a2da4 100644
--- a/index.php
+++ b/index.php
@@ -21,6 +21,14 @@
*
*/
+// Show warning if a PHP version below 5.4.0 is used, this has to happen here
+// because base.php will already use 5.4 syntax.
+if (version_compare(PHP_VERSION, '5.4.0') === -1) {
+ echo 'This version of ownCloud requires at least PHP 5.4.0<br/>';
+ echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+ return;
+}
+
try {
require_once 'lib/base.php';
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index e98d8604551..e7a11ccfe22 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -105,6 +105,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
"PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, entrúga-y al to alministrador del sirvidor p'anovar PHP a la cabera versión. La to versión PHP nun ta sofitada por ownCloud y la comunidá PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?",
"Please ask your server administrator to restart the web server." : "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 requeríu",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index 29db56cf04c..b8fce475855 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -103,6 +103,8 @@
"Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
"PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, entrúga-y al to alministrador del sirvidor p'anovar PHP a la cabera versión. La to versión PHP nun ta sofitada por ownCloud y la comunidá PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?",
"Please ask your server administrator to restart the web server." : "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 requeríu",
diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js
index ad881bb4c38..009d582cb94 100644
--- a/lib/l10n/bg_BG.js
+++ b/lib/l10n/bg_BG.js
@@ -8,6 +8,15 @@ OC.L10N.register(
"Sample configuration detected" : "Открита е примерна конфигурация",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
"PHP %s or higher is required." : "Изисква се PHP %s или по-нова.",
+ "PHP with a version lower than %s is required." : "Необходим е PHP с версия по-ниска от %s.",
+ "Following databases are supported: %s" : "Следните бази данни са поддържани: %s",
+ "The command line tool %s could not be found" : "Конзолната команда %s не може да бъде намерена",
+ "The library %s is not available." : "Библиотеката %s не е налична",
+ "Library %s with a version higher than %s is required - available version %s." : "Необходима е библиотеката %s с версия по-висока от %s - налична версия %s. ",
+ "Library %s with a version lower than %s is required - available version %s." : "Необходима е библиотеката %s с версия по-ниска от %s - налична версия %s. ",
+ "Following platforms are supported: %s" : "Поддържани са следните платформи: %s",
+ "ownCloud %s or higher is required." : "Необходим е ownCloud %s или по-висока версия.",
+ "ownCloud with a version lower than %s is required." : "Необходим е ownCloud с по-ниска версия от %s.",
"Help" : "Помощ",
"Personal" : "Лични",
"Settings" : "Настройки",
@@ -15,16 +24,17 @@ OC.L10N.register(
"Admin" : "Админ",
"Recommended" : "Препоръчано",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Приложението \\\"%s\\\" не може да бъде инсталирано, защот следните зависимости не са удовлетворени: %s",
"No app name specified" : "Не е зададено име на преложението",
"Unknown filetype" : "Непознат тип файл.",
"Invalid image" : "Невалидно изображение.",
"today" : "днес",
"yesterday" : "вчера",
- "_%n day ago_::_%n days ago_" : ["",""],
+ "_%n day ago_::_%n days ago_" : ["преди %n ден","преди %n дни"],
"last month" : "миналия месец",
"_%n month ago_::_%n months ago_" : ["","преди %n месеца"],
"last year" : "миналата година",
- "_%n year ago_::_%n years ago_" : ["",""],
+ "_%n year ago_::_%n years ago_" : ["преди %n година","преди %n години"],
"_%n hour ago_::_%n hours ago_" : ["","преди %n часа"],
"_%n minute ago_::_%n minutes ago_" : ["","преди %n минути"],
"seconds ago" : "преди секунди",
@@ -67,6 +77,7 @@ OC.L10N.register(
"Set an admin password." : "Задай парола за администратор.",
"Can't create or write into the data directory %s" : "Неуспешно създаване или записване в \"data\" папката %s",
"%s shared »%s« with you" : "%s сподели »%s« с теб",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Неуспешно споделяне на %s , защото сървъра не позволява споделяне от тип $i.",
"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 е оригиналния собственик.",
@@ -77,6 +88,7 @@ OC.L10N.register(
"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, защото споделянето посредством връзки не е разрешено.",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Неуспешно споделяне на на %s, не може бъде намерено %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, защото съдържанието не е открито.",
@@ -107,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.",
"PHP module %s not installed." : "PHP модулът %s не е инсталиран.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Моля, поискай твоят администратор да обнови PHP до най-новата верския. Твоята PHP версия вече не се поддържа от ownCloud и PHP общността.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP е конфигуриран да запълва post данните от ниско ниво. От PHP 5.6 насам това води до връщането на грешки при абсолютно валиден код.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "За да поправите този проблем, задайте на <code>always_populate_raw_post_data</code> стойност <code>-1</code> във вашоя php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP модулите са инсталирани, но все още се обявяват като липсващи?",
"Please ask your server administrator to restart the web server." : "Моля, поискай от своя администратор да рестартира уеб сървъра.",
"PostgreSQL >= 9 required" : "Изисква се PostgreSQL >= 9",
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json
index f92811686d7..2e9c228729d 100644
--- a/lib/l10n/bg_BG.json
+++ b/lib/l10n/bg_BG.json
@@ -6,6 +6,15 @@
"Sample configuration detected" : "Открита е примерна конфигурация",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
"PHP %s or higher is required." : "Изисква се PHP %s или по-нова.",
+ "PHP with a version lower than %s is required." : "Необходим е PHP с версия по-ниска от %s.",
+ "Following databases are supported: %s" : "Следните бази данни са поддържани: %s",
+ "The command line tool %s could not be found" : "Конзолната команда %s не може да бъде намерена",
+ "The library %s is not available." : "Библиотеката %s не е налична",
+ "Library %s with a version higher than %s is required - available version %s." : "Необходима е библиотеката %s с версия по-висока от %s - налична версия %s. ",
+ "Library %s with a version lower than %s is required - available version %s." : "Необходима е библиотеката %s с версия по-ниска от %s - налична версия %s. ",
+ "Following platforms are supported: %s" : "Поддържани са следните платформи: %s",
+ "ownCloud %s or higher is required." : "Необходим е ownCloud %s или по-висока версия.",
+ "ownCloud with a version lower than %s is required." : "Необходим е ownCloud с по-ниска версия от %s.",
"Help" : "Помощ",
"Personal" : "Лични",
"Settings" : "Настройки",
@@ -13,16 +22,17 @@
"Admin" : "Админ",
"Recommended" : "Препоръчано",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Приложението \\\"%s\\\" не може да бъде инсталирано, защот следните зависимости не са удовлетворени: %s",
"No app name specified" : "Не е зададено име на преложението",
"Unknown filetype" : "Непознат тип файл.",
"Invalid image" : "Невалидно изображение.",
"today" : "днес",
"yesterday" : "вчера",
- "_%n day ago_::_%n days ago_" : ["",""],
+ "_%n day ago_::_%n days ago_" : ["преди %n ден","преди %n дни"],
"last month" : "миналия месец",
"_%n month ago_::_%n months ago_" : ["","преди %n месеца"],
"last year" : "миналата година",
- "_%n year ago_::_%n years ago_" : ["",""],
+ "_%n year ago_::_%n years ago_" : ["преди %n година","преди %n години"],
"_%n hour ago_::_%n hours ago_" : ["","преди %n часа"],
"_%n minute ago_::_%n minutes ago_" : ["","преди %n минути"],
"seconds ago" : "преди секунди",
@@ -65,6 +75,7 @@
"Set an admin password." : "Задай парола за администратор.",
"Can't create or write into the data directory %s" : "Неуспешно създаване или записване в \"data\" папката %s",
"%s shared »%s« with you" : "%s сподели »%s« с теб",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Неуспешно споделяне на %s , защото сървъра не позволява споделяне от тип $i.",
"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 е оригиналния собственик.",
@@ -75,6 +86,7 @@
"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, защото споделянето посредством връзки не е разрешено.",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Неуспешно споделяне на на %s, не може бъде намерено %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, защото съдържанието не е открито.",
@@ -105,6 +117,10 @@
"Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.",
"PHP module %s not installed." : "PHP модулът %s не е инсталиран.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Моля, поискай твоят администратор да обнови PHP до най-новата верския. Твоята PHP версия вече не се поддържа от ownCloud и PHP общността.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP е конфигуриран да запълва post данните от ниско ниво. От PHP 5.6 насам това води до връщането на грешки при абсолютно валиден код.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "За да поправите този проблем, задайте на <code>always_populate_raw_post_data</code> стойност <code>-1</code> във вашоя php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP модулите са инсталирани, но все още се обявяват като липсващи?",
"Please ask your server administrator to restart the web server." : "Моля, поискай от своя администратор да рестартира уеб сървъра.",
"PostgreSQL >= 9 required" : "Изисква се PostgreSQL >= 9",
diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js
index a5b30189b3e..cad023a3701 100644
--- a/lib/l10n/bs.js
+++ b/lib/l10n/bs.js
@@ -16,6 +16,8 @@ OC.L10N.register(
"_%n minute ago_::_%n minutes ago_" : ["","",""],
"Authentication error" : "Grešna autentifikacije",
"A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
- "A valid password must be provided" : "Nužno je navesti valjanu lozinku"
+ "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen da se skine inline doc blokova. To će nekoliko osnovnih aplikacija učiniti nedostupnim.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator."
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/bs.json b/lib/l10n/bs.json
index 1a9a07c7245..df1b3fbd25e 100644
--- a/lib/l10n/bs.json
+++ b/lib/l10n/bs.json
@@ -14,6 +14,8 @@
"_%n minute ago_::_%n minutes ago_" : ["","",""],
"Authentication error" : "Grešna autentifikacije",
"A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
- "A valid password must be provided" : "Nužno je navesti valjanu lozinku"
+ "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen da se skine inline doc blokova. To će nekoliko osnovnih aplikacija učiniti nedostupnim.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator."
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js
index 25946231692..d086be8adac 100644
--- a/lib/l10n/ca.js
+++ b/lib/l10n/ca.js
@@ -104,6 +104,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.",
"PHP module %s not installed." : "El mòdul PHP %s no està instal·lat.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Demaneu a l'administrador que actualitzi PHP a l'última versió. La versió que teniu instal·lada no té suport d'ownCloud ni de la comunitat PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?",
"Please ask your server administrator to restart the web server." : "Demaneu a l'administrador que reinici el servidor web.",
"PostgreSQL >= 9 required" : "Es requereix PostgreSQL >= 9",
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
index ed6dc3883ff..e0928e6d606 100644
--- a/lib/l10n/ca.json
+++ b/lib/l10n/ca.json
@@ -102,6 +102,8 @@
"Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.",
"PHP module %s not installed." : "El mòdul PHP %s no està instal·lat.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Demaneu a l'administrador que actualitzi PHP a l'última versió. La versió que teniu instal·lada no té suport d'ownCloud ni de la comunitat PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?",
"Please ask your server administrator to restart the web server." : "Demaneu a l'administrador que reinici el servidor web.",
"PostgreSQL >= 9 required" : "Es requereix PostgreSQL >= 9",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index bd84e624e07..3eba7347b72 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Požádejte svého správce systému o instalaci tohoto modulu.",
"PHP module %s not installed." : "PHP modul %s není nainstalován.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého správce systému o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP je nakonfigurováno vytvářet raw post data. Od verze 5.6 bude toto nastavení vést PHP k vypisování hlášení i pro perfektně správný kód.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Pro nápravu tohoto chování nastavte <code>always_populate_raw_post_data</code> na <code>-1</code> ve svém php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
"Please ask your server administrator to restart the web server." : "Požádejte svého správce systému o restart webového serveru.",
"PostgreSQL >= 9 required" : "Je vyžadováno PostgreSQL >= 9",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index 6d856795aa2..dbbdccf9261 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Požádejte svého správce systému o instalaci tohoto modulu.",
"PHP module %s not installed." : "PHP modul %s není nainstalován.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého správce systému o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP je nakonfigurováno vytvářet raw post data. Od verze 5.6 bude toto nastavení vést PHP k vypisování hlášení i pro perfektně správný kód.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Pro nápravu tohoto chování nastavte <code>always_populate_raw_post_data</code> na <code>-1</code> ve svém php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
"Please ask your server administrator to restart the web server." : "Požádejte svého správce systému o restart webového serveru.",
"PostgreSQL >= 9 required" : "Je vyžadováno PostgreSQL >= 9",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 56ac9a4f14f..362f27e3416 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Du bedes anmode din serveradministrator om at installere modulet.",
"PHP module %s not installed." : "PHP-modulet %s er ikke installeret.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bed venligst din serveradministrator om at opdatere PHP til seneste version. Din PHP-version understøttes ikke længere af ownCload og PHP-fællesskabet.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP er konfigureret til at udfylde rå postdata. Siden PHP 5.6 har dette ført til, at PHP smider med notitser for fuldstændig gyldig kode.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "For at rette dette problem, så angiv <code>always_populate_raw_post_data</code> til <code>-1</code> i din php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
"PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremgår stadig som fraværende?",
"Please ask your server administrator to restart the web server." : "Du bedes anmode din serveradministrator om at genstarte webserveren.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 kræves",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index e49698c30d8..b0ab2b4f6e7 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Du bedes anmode din serveradministrator om at installere modulet.",
"PHP module %s not installed." : "PHP-modulet %s er ikke installeret.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bed venligst din serveradministrator om at opdatere PHP til seneste version. Din PHP-version understøttes ikke længere af ownCload og PHP-fællesskabet.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP er konfigureret til at udfylde rå postdata. Siden PHP 5.6 har dette ført til, at PHP smider med notitser for fuldstændig gyldig kode.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "For at rette dette problem, så angiv <code>always_populate_raw_post_data</code> til <code>-1</code> i din php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
"PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremgår stadig som fraværende?",
"Please ask your server administrator to restart the web server." : "Du bedes anmode din serveradministrator om at genstarte webserveren.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 kræves",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 27715389389..91f2544058b 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -40,7 +40,7 @@ OC.L10N.register(
"seconds ago" : "Gerade eben",
"Database Error" : "Datenbankfehler",
"Please contact your system administrator." : "Bitte kontaktiere Deinen Systemadministrator.",
- "web services under your control" : "Web-Services unter Deiner Kontrolle",
+ "web services under your control" : "Web-Dienste unter Deiner Kontrolle",
"App directory already exists" : "Das Applikationsverzeichnis existiert bereits",
"Can't create app folder. Please fix permissions. %s" : "Es kann kein Applikationsordner erstellt werden. Bitte passe die Berechtigungen an. %s",
"No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben",
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.",
"PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte frage zur Aktualisierung von PHP auf die letzte Version Deinen Server-Administrator. Deine PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP ist konfiguriert, unverarbeitete POST-Daten zu füllen. Seit PHP 5.6 führt dies dazu, dass PHP Warnmeldungen für vollkommen gültigen Code ausgibt.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Setze <code>always_populate_raw_post_data</code> in Deiner php.ini auf <code>-1</code>, um dieses Problem zu beheben.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
"Please ask your server administrator to restart the web server." : "Bitte frage Deinen Server-Administrator zum Neustart des Webservers.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 9410d0cb783..ae255cd7b1e 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -38,7 +38,7 @@
"seconds ago" : "Gerade eben",
"Database Error" : "Datenbankfehler",
"Please contact your system administrator." : "Bitte kontaktiere Deinen Systemadministrator.",
- "web services under your control" : "Web-Services unter Deiner Kontrolle",
+ "web services under your control" : "Web-Dienste unter Deiner Kontrolle",
"App directory already exists" : "Das Applikationsverzeichnis existiert bereits",
"Can't create app folder. Please fix permissions. %s" : "Es kann kein Applikationsordner erstellt werden. Bitte passe die Berechtigungen an. %s",
"No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben",
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.",
"PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte frage zur Aktualisierung von PHP auf die letzte Version Deinen Server-Administrator. Deine PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP ist konfiguriert, unverarbeitete POST-Daten zu füllen. Seit PHP 5.6 führt dies dazu, dass PHP Warnmeldungen für vollkommen gültigen Code ausgibt.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Setze <code>always_populate_raw_post_data</code> in Deiner php.ini auf <code>-1</code>, um dieses Problem zu beheben.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
"Please ask your server administrator to restart the web server." : "Bitte frage Deinen Server-Administrator zum Neustart des Webservers.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index d40ddc91236..02346b0e8d2 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -1,7 +1,7 @@
OC.L10N.register(
"lib",
{
- "Cannot write into \"config\" directory!" : "Das Schreiben in das »config«-Verzeichnis nicht möglich!",
+ "Cannot write into \"config\" directory!" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich!",
"This can usually be fixed by giving the webserver write access to the config directory" : "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
"See %s" : "Siehe %s",
"This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
@@ -23,9 +23,9 @@ OC.L10N.register(
"Users" : "Benutzer",
"Admin" : "Administrator",
"Recommended" : "Empfohlen",
- "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
- "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App \\\"%s\\\" kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind: %s",
- "No app name specified" : "Es wurde kein Applikation-Name angegeben",
+ "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Die App „%s“ kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App „%s“ kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind: %s",
+ "No app name specified" : "Es wurde kein App-Name angegeben",
"Unknown filetype" : "Unbekannter Dateityp",
"Invalid image" : "Ungültiges Bild",
"today" : "Heute",
@@ -40,9 +40,9 @@ OC.L10N.register(
"seconds ago" : "Gerade eben",
"Database Error" : "Datenbankfehler",
"Please contact your system administrator." : "Bitte kontaktieren Sie Ihren Systemadministrator.",
- "web services under your control" : "Web-Services unter Ihrer Kontrolle",
- "App directory already exists" : "Der Ordner für die Anwendung ist bereits vorhanden.",
- "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
+ "web services under your control" : "Web-Dienste unter Ihrer Kontrolle",
+ "App directory already exists" : "Der Ordner für die App ist bereits vorhanden.",
+ "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die App konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
"No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben",
"No href specified when installing app from http" : "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
"No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
@@ -60,29 +60,29 @@ OC.L10N.register(
"%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.",
"%s enter the database name." : "%s geben Sie den Datenbank-Namen an.",
"%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten",
- "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s",
+ "MS SQL username and/or password not valid: %s" : "MS SQL-Benutzername und/oder -Passwort ungültig: %s",
"You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
- "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
+ "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB-Benutzername und/oder -Passwort sind nicht gültig",
"DB Error: \"%s\"" : "DB Fehler: \"%s\"",
"Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
"MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
"Drop this user from MySQL/MariaDB" : "Löschen Sie diesen Benutzer von MySQL/MariaDB",
- "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+ "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB-Benutzer '%s'@'%%' existiert bereits",
"Drop this user from MySQL/MariaDB." : "Löschen Sie diesen Benutzer von MySQL/MariaDB.",
"Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
- "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig",
+ "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig",
"Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
- "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig",
- "Set an admin username." : "Setze Administrator Benutzername.",
+ "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
+ "Set an admin username." : "Einen Administrator-Benutzernamen setzen.",
"Set an admin password." : "Setze Administrator Passwort",
"Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
"%s shared »%s« with you" : "%s hat »%s« mit Ihnen geteilt",
"Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.",
"Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
"You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
- "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
- "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
- "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
+ "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s Besitzer des Objektes ist",
+ "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s nicht existiert",
+ "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
"Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
"Sharing %s failed, because the group %s does not exist" : "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
"Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
@@ -97,7 +97,7 @@ OC.L10N.register(
"Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
"Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden",
"Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden",
- "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
+ "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s der ursprünglich Teilende ist",
"Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
"Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte",
@@ -119,14 +119,18 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.",
"PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte fragen Sie zur Aktualisierung von PHP auf die letzte Version Ihren Server-Administrator. Ihre PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP ist konfiguriert, unverarbeitete POST-Daten zu füllen. Seit PHP 5.6 führt dies dazu, dass PHP Warnmeldungen für vollkommen gültigen Code ausgibt.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Setzen Sie in Ihrer php.ini <code>always_populate_raw_post_data</code> auf <code>-1</code>, um dieses Problem zu beheben.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
"Please ask your server administrator to restart the web server." : "Bitte fragen Sie Ihren Server-Administrator zum Neustart des Webservers.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
"Please upgrade your database version" : "Bitte aktualisieren Sie Ihre Datenbankversion",
"Error occurred while checking PostgreSQL version" : "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Stellen Sie sicher, dass Sie PostgreSQL >= 9 verwenden oder prüfen Sie die Logs für weitere Informationen über den Fehler",
- "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
- "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
+ "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770, so dass das Verzeichnis nicht von anderen Benutzern angezeigt werden kann.",
+ "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Benutzern lesbar",
"Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig",
"Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
"Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf »%s« konnte nicht ermittelt werden."
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 857ec81175f..20ff8b059ee 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -1,5 +1,5 @@
{ "translations": {
- "Cannot write into \"config\" directory!" : "Das Schreiben in das »config«-Verzeichnis nicht möglich!",
+ "Cannot write into \"config\" directory!" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich!",
"This can usually be fixed by giving the webserver write access to the config directory" : "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
"See %s" : "Siehe %s",
"This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
@@ -21,9 +21,9 @@
"Users" : "Benutzer",
"Admin" : "Administrator",
"Recommended" : "Empfohlen",
- "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
- "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App \\\"%s\\\" kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind: %s",
- "No app name specified" : "Es wurde kein Applikation-Name angegeben",
+ "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Die App „%s“ kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App „%s“ kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind: %s",
+ "No app name specified" : "Es wurde kein App-Name angegeben",
"Unknown filetype" : "Unbekannter Dateityp",
"Invalid image" : "Ungültiges Bild",
"today" : "Heute",
@@ -38,9 +38,9 @@
"seconds ago" : "Gerade eben",
"Database Error" : "Datenbankfehler",
"Please contact your system administrator." : "Bitte kontaktieren Sie Ihren Systemadministrator.",
- "web services under your control" : "Web-Services unter Ihrer Kontrolle",
- "App directory already exists" : "Der Ordner für die Anwendung ist bereits vorhanden.",
- "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
+ "web services under your control" : "Web-Dienste unter Ihrer Kontrolle",
+ "App directory already exists" : "Der Ordner für die App ist bereits vorhanden.",
+ "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die App konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
"No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben",
"No href specified when installing app from http" : "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
"No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
@@ -58,29 +58,29 @@
"%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.",
"%s enter the database name." : "%s geben Sie den Datenbank-Namen an.",
"%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten",
- "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s",
+ "MS SQL username and/or password not valid: %s" : "MS SQL-Benutzername und/oder -Passwort ungültig: %s",
"You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
- "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
+ "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB-Benutzername und/oder -Passwort sind nicht gültig",
"DB Error: \"%s\"" : "DB Fehler: \"%s\"",
"Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
"MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
"Drop this user from MySQL/MariaDB" : "Löschen Sie diesen Benutzer von MySQL/MariaDB",
- "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+ "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB-Benutzer '%s'@'%%' existiert bereits",
"Drop this user from MySQL/MariaDB." : "Löschen Sie diesen Benutzer von MySQL/MariaDB.",
"Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
- "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig",
+ "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig",
"Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
- "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig",
- "Set an admin username." : "Setze Administrator Benutzername.",
+ "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
+ "Set an admin username." : "Einen Administrator-Benutzernamen setzen.",
"Set an admin password." : "Setze Administrator Passwort",
"Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
"%s shared »%s« with you" : "%s hat »%s« mit Ihnen geteilt",
"Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.",
"Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
"You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
- "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
- "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
- "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
+ "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s Besitzer des Objektes ist",
+ "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s nicht existiert",
+ "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
"Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
"Sharing %s failed, because the group %s does not exist" : "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
"Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
@@ -95,7 +95,7 @@
"Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
"Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden",
"Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden",
- "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
+ "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s der ursprünglich Teilende ist",
"Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
"Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte",
@@ -117,14 +117,18 @@
"Please ask your server administrator to install the module." : "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.",
"PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte fragen Sie zur Aktualisierung von PHP auf die letzte Version Ihren Server-Administrator. Ihre PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP ist konfiguriert, unverarbeitete POST-Daten zu füllen. Seit PHP 5.6 führt dies dazu, dass PHP Warnmeldungen für vollkommen gültigen Code ausgibt.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Setzen Sie in Ihrer php.ini <code>always_populate_raw_post_data</code> auf <code>-1</code>, um dieses Problem zu beheben.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
"Please ask your server administrator to restart the web server." : "Bitte fragen Sie Ihren Server-Administrator zum Neustart des Webservers.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
"Please upgrade your database version" : "Bitte aktualisieren Sie Ihre Datenbankversion",
"Error occurred while checking PostgreSQL version" : "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Stellen Sie sicher, dass Sie PostgreSQL >= 9 verwenden oder prüfen Sie die Logs für weitere Informationen über den Fehler",
- "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
- "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
+ "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770, so dass das Verzeichnis nicht von anderen Benutzern angezeigt werden kann.",
+ "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Benutzern lesbar",
"Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig",
"Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
"Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf »%s« konnte nicht ermittelt werden."
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index be184d26a12..db45139a1cb 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -107,6 +107,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.",
"PHP module %s not installed." : "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;",
"Please ask your server administrator to restart the web server." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.",
"PostgreSQL >= 9 required" : "Απαιτείται PostgreSQL >= 9",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index d2dd35998eb..da637c4a12b 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -105,6 +105,8 @@
"Please ask your server administrator to install the module." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.",
"PHP module %s not installed." : "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;",
"Please ask your server administrator to restart the web server." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.",
"PostgreSQL >= 9 required" : "Απαιτείται PostgreSQL >= 9",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index c38e02fb308..e3c2a7ab67d 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.",
"PHP module %s not installed." : "PHP module %s not installed.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?",
"Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 required",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index 9a59493491f..013afd3a0d1 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.",
"PHP module %s not installed." : "PHP module %s not installed.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?",
"Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 required",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 14076a8dc0d..39631f01c05 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Consulte al administrador de su servidor para instalar el módulo.",
"PHP module %s not installed." : "El módulo PHP %s no está instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Consulte a su administrador del servidor para actualizar PHP a la versión más reciente. Su versión de PHP ya no es apoyado por ownCloud y la comunidad PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para transmitir datos raw. Desde la versión 5.6 de PHP se permitirá enviar noticias perfectamente validas.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para arreglar este error, cambia <code>always_populate_raw_post_data</code> a <code>-1</code> en su php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Los módulos PHP se han instalado, pero aparecen listados como si faltaran",
"Please ask your server administrator to restart the web server." : "Consulte al administrador de su servidor para reiniciar el servidor web.",
"PostgreSQL >= 9 required" : "PostgreSQL 9 o superior requerido.",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 78166b21b5e..5b08223b093 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Consulte al administrador de su servidor para instalar el módulo.",
"PHP module %s not installed." : "El módulo PHP %s no está instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Consulte a su administrador del servidor para actualizar PHP a la versión más reciente. Su versión de PHP ya no es apoyado por ownCloud y la comunidad PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para transmitir datos raw. Desde la versión 5.6 de PHP se permitirá enviar noticias perfectamente validas.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para arreglar este error, cambia <code>always_populate_raw_post_data</code> a <code>-1</code> en su php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Los módulos PHP se han instalado, pero aparecen listados como si faltaran",
"Please ask your server administrator to restart the web server." : "Consulte al administrador de su servidor para reiniciar el servidor web.",
"PostgreSQL >= 9 required" : "PostgreSQL 9 o superior requerido.",
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index 1e48fc90216..2718a1e4223 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -105,6 +105,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.",
"PHP module %s not installed." : "PHP moodulit %s pole paigaldatud.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Palu oma serveri haldajal uuendada PHP viimasele versioonile. Sinu PHP versioon pole enam toetatud ownCloud-i ja PHP kogukonna poolt.",
+ "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.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?",
"Please ask your server administrator to restart the web server." : "Palu oma serveri haldajal veebiserver taaskäivitada.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 on nõutav",
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index 05486f6d8a0..f71ee98481d 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -103,6 +103,8 @@
"Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.",
"PHP module %s not installed." : "PHP moodulit %s pole paigaldatud.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Palu oma serveri haldajal uuendada PHP viimasele versioonile. Sinu PHP versioon pole enam toetatud ownCloud-i ja PHP kogukonna poolt.",
+ "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.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?",
"Please ask your server administrator to restart the web server." : "Palu oma serveri haldajal veebiserver taaskäivitada.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 on nõutav",
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
index 7af354cdf6c..e28eec8e214 100644
--- a/lib/l10n/eu.js
+++ b/lib/l10n/eu.js
@@ -8,6 +8,15 @@ OC.L10N.register(
"Sample configuration detected" : "Adibide-ezarpena detektatua",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
"PHP %s or higher is required." : "PHP %s edo berriagoa behar da.",
+ "PHP with a version lower than %s is required." : "PHPren bertsioa %s baino txikiagoa izan behar da.",
+ "Following databases are supported: %s" : "Hurrengo datubaseak onartzen dira: %s",
+ "The command line tool %s could not be found" : "Komando lerroko %s tresna ezin da aurkitu",
+ "The library %s is not available." : "%s liburutegia ez dago eskuragarri.",
+ "Library %s with a version higher than %s is required - available version %s." : "%s liburutegiak %s baino bertsio handiagoa izan behar du - dagoen bertsioa %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "%s liburutegiak %s baino bertsio txikiagoa izan behar du - dagoen bertsioa %s.",
+ "Following platforms are supported: %s" : "Hurrengo plataformak onartzen dira: %s",
+ "ownCloud %s or higher is required." : "ownCloud %s edo haundiagoa behar da.",
+ "ownCloud with a version lower than %s is required." : "ownCloud %s baino bertsio txikiagoa behar da.",
"Help" : "Laguntza",
"Personal" : "Pertsonala",
"Settings" : "Ezarpenak",
@@ -15,19 +24,22 @@ OC.L10N.register(
"Admin" : "Admin",
"Recommended" : "Aholkatuta",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "\\\"%s\\\" Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako: %s",
"No app name specified" : "Ez da aplikazioaren izena zehaztu",
"Unknown filetype" : "Fitxategi mota ezezaguna",
"Invalid image" : "Baliogabeko irudia",
"today" : "gaur",
"yesterday" : "atzo",
- "_%n day ago_::_%n days ago_" : ["",""],
+ "_%n day ago_::_%n days ago_" : ["orain dela egun %n","orain dela %n egun"],
"last month" : "joan den hilabetean",
"_%n month ago_::_%n months ago_" : ["orain dela hilabete %n","orain dela %n hilabete"],
"last year" : "joan den urtean",
- "_%n year ago_::_%n years ago_" : ["",""],
+ "_%n year ago_::_%n years ago_" : ["orain dela urte %n","orain dela %n urte"],
"_%n hour ago_::_%n hours ago_" : ["orain dela ordu %n","orain dela %n ordu"],
"_%n minute ago_::_%n minutes ago_" : ["orain dela minutu %n","orain dela %n minutu"],
"seconds ago" : "segundu",
+ "Database Error" : "Datu basearen errorea",
+ "Please contact your system administrator." : "Mesedez jarri harremetan zure sistemaren kudeatzailearekin.",
"web services under your control" : "web zerbitzuak zure kontrolpean",
"App directory already exists" : "Aplikazioaren karpeta dagoeneko existitzen da",
"Can't create app folder. Please fix permissions. %s" : "Ezin izan da aplikazioaren karpeta sortu. Mesdez konpondu baimenak. %s",
@@ -65,6 +77,7 @@ OC.L10N.register(
"Set an admin password." : "Ezarri administraziorako pasahitza.",
"Can't create or write into the data directory %s" : "Ezin da %s datu karpeta sortu edo bertan idatzi ",
"%s shared »%s« with you" : "%s-ek »%s« zurekin partekatu du",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "%s partekatzeak huts egin du, motorrak %i motako partekatzeak baimentzen ez dituelako",
"Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
"You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
"Sharing %s failed, because the user %s is the item owner" : "%s elkarbanatzeak huts egin du, %s erabiltzailea jabea delako",
@@ -75,6 +88,7 @@ OC.L10N.register(
"Sharing %s failed, because %s is not a member of the group %s" : "%s elkarbanatzeak huts egin du, %s ez delako %s taldearen partaidea",
"You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
"Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s partekatzeak huts egin du, ezin da %s aurkitu, agian zerbitzaria orain ez dago eskuragarri.",
"Share type %s is not valid for %s" : "%s elkarbanaketa mota ez da %srentzako egokia",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%srentzako baimenak ezartzea huts egin du, baimenak %sri emandakoak baino gehiago direlako",
"Setting permissions for %s failed, because the item was not found" : "%srentzako baimenak ezartzea huts egin du, aurkitu ez delako",
@@ -105,6 +119,9 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.",
"PHP module %s not installed." : "PHPren %s modulua ez dago instalaturik.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari PHP azkenengo bertsiora eguneratzea. Zure PHP bertsioa ez dute ez ownCloud eta ez PHP komunitateek mantentzen.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Hau konpontzeko ezarri <code>always_populate_raw_post_data</code> berdin <code>-1</code> zure php.inian",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?",
"Please ask your server administrator to restart the web server." : "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 behar da",
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
index 3735988aab8..6405f8968fb 100644
--- a/lib/l10n/eu.json
+++ b/lib/l10n/eu.json
@@ -6,6 +6,15 @@
"Sample configuration detected" : "Adibide-ezarpena detektatua",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
"PHP %s or higher is required." : "PHP %s edo berriagoa behar da.",
+ "PHP with a version lower than %s is required." : "PHPren bertsioa %s baino txikiagoa izan behar da.",
+ "Following databases are supported: %s" : "Hurrengo datubaseak onartzen dira: %s",
+ "The command line tool %s could not be found" : "Komando lerroko %s tresna ezin da aurkitu",
+ "The library %s is not available." : "%s liburutegia ez dago eskuragarri.",
+ "Library %s with a version higher than %s is required - available version %s." : "%s liburutegiak %s baino bertsio handiagoa izan behar du - dagoen bertsioa %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "%s liburutegiak %s baino bertsio txikiagoa izan behar du - dagoen bertsioa %s.",
+ "Following platforms are supported: %s" : "Hurrengo plataformak onartzen dira: %s",
+ "ownCloud %s or higher is required." : "ownCloud %s edo haundiagoa behar da.",
+ "ownCloud with a version lower than %s is required." : "ownCloud %s baino bertsio txikiagoa behar da.",
"Help" : "Laguntza",
"Personal" : "Pertsonala",
"Settings" : "Ezarpenak",
@@ -13,19 +22,22 @@
"Admin" : "Admin",
"Recommended" : "Aholkatuta",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "\\\"%s\\\" Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako: %s",
"No app name specified" : "Ez da aplikazioaren izena zehaztu",
"Unknown filetype" : "Fitxategi mota ezezaguna",
"Invalid image" : "Baliogabeko irudia",
"today" : "gaur",
"yesterday" : "atzo",
- "_%n day ago_::_%n days ago_" : ["",""],
+ "_%n day ago_::_%n days ago_" : ["orain dela egun %n","orain dela %n egun"],
"last month" : "joan den hilabetean",
"_%n month ago_::_%n months ago_" : ["orain dela hilabete %n","orain dela %n hilabete"],
"last year" : "joan den urtean",
- "_%n year ago_::_%n years ago_" : ["",""],
+ "_%n year ago_::_%n years ago_" : ["orain dela urte %n","orain dela %n urte"],
"_%n hour ago_::_%n hours ago_" : ["orain dela ordu %n","orain dela %n ordu"],
"_%n minute ago_::_%n minutes ago_" : ["orain dela minutu %n","orain dela %n minutu"],
"seconds ago" : "segundu",
+ "Database Error" : "Datu basearen errorea",
+ "Please contact your system administrator." : "Mesedez jarri harremetan zure sistemaren kudeatzailearekin.",
"web services under your control" : "web zerbitzuak zure kontrolpean",
"App directory already exists" : "Aplikazioaren karpeta dagoeneko existitzen da",
"Can't create app folder. Please fix permissions. %s" : "Ezin izan da aplikazioaren karpeta sortu. Mesdez konpondu baimenak. %s",
@@ -63,6 +75,7 @@
"Set an admin password." : "Ezarri administraziorako pasahitza.",
"Can't create or write into the data directory %s" : "Ezin da %s datu karpeta sortu edo bertan idatzi ",
"%s shared »%s« with you" : "%s-ek »%s« zurekin partekatu du",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "%s partekatzeak huts egin du, motorrak %i motako partekatzeak baimentzen ez dituelako",
"Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
"You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
"Sharing %s failed, because the user %s is the item owner" : "%s elkarbanatzeak huts egin du, %s erabiltzailea jabea delako",
@@ -73,6 +86,7 @@
"Sharing %s failed, because %s is not a member of the group %s" : "%s elkarbanatzeak huts egin du, %s ez delako %s taldearen partaidea",
"You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
"Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s partekatzeak huts egin du, ezin da %s aurkitu, agian zerbitzaria orain ez dago eskuragarri.",
"Share type %s is not valid for %s" : "%s elkarbanaketa mota ez da %srentzako egokia",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%srentzako baimenak ezartzea huts egin du, baimenak %sri emandakoak baino gehiago direlako",
"Setting permissions for %s failed, because the item was not found" : "%srentzako baimenak ezartzea huts egin du, aurkitu ez delako",
@@ -103,6 +117,9 @@
"Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.",
"PHP module %s not installed." : "PHPren %s modulua ez dago instalaturik.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari PHP azkenengo bertsiora eguneratzea. Zure PHP bertsioa ez dute ez ownCloud eta ez PHP komunitateek mantentzen.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Hau konpontzeko ezarri <code>always_populate_raw_post_data</code> berdin <code>-1</code> zure php.inian",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?",
"Please ask your server administrator to restart the web server." : "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 behar da",
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index 8dfa7fa9c03..5c37b9c4093 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -7,12 +7,15 @@ OC.L10N.register(
"This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
"Sample configuration detected" : "Esimerkkimääritykset havaittu",
"PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.",
+ "PHP with a version lower than %s is required." : "PHP versiota %s alempi tarvitaan.",
"Following databases are supported: %s" : "Seuraavat tietokannat ovat tuettuja: %s",
"The command line tool %s could not be found" : "Komentorivityökalua %s ei löytynyt",
"The library %s is not available." : "Kirjastoa %s ei ole käytettävissä.",
"Library %s with a version higher than %s is required - available version %s." : "Kirjasto %s versiota %s tai uudempi vaaditaan - käytettävissä oleva versio %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "Kirjasto %s versiota alempi %s tarvitaan - käytettävissä oleva versio %s.",
"Following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s",
"ownCloud %s or higher is required." : "ownCloud %s tai uudempi vaaditaan.",
+ "ownCloud with a version lower than %s is required." : "ownCloud versiota %s alempi vaaditaan.",
"Help" : "Ohje",
"Personal" : "Henkilökohtainen",
"Settings" : "Asetukset",
@@ -20,6 +23,7 @@ OC.L10N.register(
"Admin" : "Ylläpito",
"Recommended" : "Suositeltu",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Sovellusta \\\"%s\\\" ei voi asentaa, koska seuraavat riippuvuudet eivät täyty: %s",
"No app name specified" : "Sovelluksen nimeä ei määritelty",
"Unknown filetype" : "Tuntematon tiedostotyyppi",
"Invalid image" : "Virheellinen kuva",
@@ -100,6 +104,7 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Pyydä palvelimen ylläpitäjää asentamaan moduulin.",
"PHP module %s not installed." : "PHP-moduulia %s ei ole asennettu.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pyydä palvelimen ylläpitäjää päivittämään PHP uusimpaan versioon. Käyttämäsi PHP-versio ei ole enää tuettu ownCloud- ja PHP-yhteisön toimesta.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Korjaa ongelma asettamalla asetuksen <code>always_populate_raw_post_data</code> arvoksi <code>-1</code> php.ini-tiedostossa",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?",
"Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 vaaditaan",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index da126175e2f..38215ca862d 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -5,12 +5,15 @@
"This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
"Sample configuration detected" : "Esimerkkimääritykset havaittu",
"PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.",
+ "PHP with a version lower than %s is required." : "PHP versiota %s alempi tarvitaan.",
"Following databases are supported: %s" : "Seuraavat tietokannat ovat tuettuja: %s",
"The command line tool %s could not be found" : "Komentorivityökalua %s ei löytynyt",
"The library %s is not available." : "Kirjastoa %s ei ole käytettävissä.",
"Library %s with a version higher than %s is required - available version %s." : "Kirjasto %s versiota %s tai uudempi vaaditaan - käytettävissä oleva versio %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "Kirjasto %s versiota alempi %s tarvitaan - käytettävissä oleva versio %s.",
"Following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s",
"ownCloud %s or higher is required." : "ownCloud %s tai uudempi vaaditaan.",
+ "ownCloud with a version lower than %s is required." : "ownCloud versiota %s alempi vaaditaan.",
"Help" : "Ohje",
"Personal" : "Henkilökohtainen",
"Settings" : "Asetukset",
@@ -18,6 +21,7 @@
"Admin" : "Ylläpito",
"Recommended" : "Suositeltu",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Sovellusta \\\"%s\\\" ei voi asentaa, koska seuraavat riippuvuudet eivät täyty: %s",
"No app name specified" : "Sovelluksen nimeä ei määritelty",
"Unknown filetype" : "Tuntematon tiedostotyyppi",
"Invalid image" : "Virheellinen kuva",
@@ -98,6 +102,7 @@
"Please ask your server administrator to install the module." : "Pyydä palvelimen ylläpitäjää asentamaan moduulin.",
"PHP module %s not installed." : "PHP-moduulia %s ei ole asennettu.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pyydä palvelimen ylläpitäjää päivittämään PHP uusimpaan versioon. Käyttämäsi PHP-versio ei ole enää tuettu ownCloud- ja PHP-yhteisön toimesta.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Korjaa ongelma asettamalla asetuksen <code>always_populate_raw_post_data</code> arvoksi <code>-1</code> php.ini-tiedostossa",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?",
"Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 vaaditaan",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 1a4ea3c1310..6e86a0fb4fb 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -9,12 +9,12 @@ OC.L10N.register(
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
"PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
"PHP with a version lower than %s is required." : "PHP avec une version antérieure à %s est requis.",
- "Following databases are supported: %s" : "Les bases de données suivantes sont supportées: %s",
+ "Following databases are supported: %s" : "Les bases de données suivantes sont supportées : %s",
"The command line tool %s could not be found" : "La commande %s est introuvable",
"The library %s is not available." : "La librairie %s n'est pas disponible.",
"Library %s with a version higher than %s is required - available version %s." : "La librairie %s doit être au moins à la version %s. Version disponible : %s.",
"Library %s with a version lower than %s is required - available version %s." : "La librairie %s doit avoir une version antérieure à %s. Version disponible : %s.",
- "Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge: %s",
+ "Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge : %s",
"ownCloud %s or higher is required." : "ownCloud %s ou supérieur est requis.",
"ownCloud with a version lower than %s is required." : "Une version antérieure à %s d'ownCloud est requise.",
"Help" : "Aide",
@@ -24,7 +24,7 @@ OC.L10N.register(
"Admin" : "Administration",
"Recommended" : "Recommandée",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
- "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'application \\\"%s\\\" ne peut être installée à cause des dépendances non satisfaites suivantes: %s",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'application \\\"%s\\\" ne peut être installée à cause des dépendances suivantes non satisfaites : %s",
"No app name specified" : "Aucun nom d'application spécifié",
"Unknown filetype" : "Type de fichier inconnu",
"Invalid image" : "Image non valable",
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
"PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus prise en charge par ownCloud ni par la communauté PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP est configuré pour remplir des données brutes POST. A partir de PHP 5.6, cela va générer des avis pour du code parfaitement valide.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Pour corriger ce problème, configurez <code>always_populate_raw_post_data</code> à <code>-1</code> dans votre php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
"Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 requis",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 6370bad1253..46384b46402 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -7,12 +7,12 @@
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
"PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
"PHP with a version lower than %s is required." : "PHP avec une version antérieure à %s est requis.",
- "Following databases are supported: %s" : "Les bases de données suivantes sont supportées: %s",
+ "Following databases are supported: %s" : "Les bases de données suivantes sont supportées : %s",
"The command line tool %s could not be found" : "La commande %s est introuvable",
"The library %s is not available." : "La librairie %s n'est pas disponible.",
"Library %s with a version higher than %s is required - available version %s." : "La librairie %s doit être au moins à la version %s. Version disponible : %s.",
"Library %s with a version lower than %s is required - available version %s." : "La librairie %s doit avoir une version antérieure à %s. Version disponible : %s.",
- "Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge: %s",
+ "Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge : %s",
"ownCloud %s or higher is required." : "ownCloud %s ou supérieur est requis.",
"ownCloud with a version lower than %s is required." : "Une version antérieure à %s d'ownCloud est requise.",
"Help" : "Aide",
@@ -22,7 +22,7 @@
"Admin" : "Administration",
"Recommended" : "Recommandée",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
- "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'application \\\"%s\\\" ne peut être installée à cause des dépendances non satisfaites suivantes: %s",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'application \\\"%s\\\" ne peut être installée à cause des dépendances suivantes non satisfaites : %s",
"No app name specified" : "Aucun nom d'application spécifié",
"Unknown filetype" : "Type de fichier inconnu",
"Invalid image" : "Image non valable",
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
"PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus prise en charge par ownCloud ni par la communauté PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP est configuré pour remplir des données brutes POST. A partir de PHP 5.6, cela va générer des avis pour du code parfaitement valide.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Pour corriger ce problème, configurez <code>always_populate_raw_post_data</code> à <code>-1</code> dans votre php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
"Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 requis",
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index cd12866e002..6a6704799ff 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Pregúntelle ao administrador do servidor pola instalación do módulo.",
"PHP module %s not installed." : "O módulo PHP %s non está instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para surtir datos de código en bruto. Desde PHP 5.6 esto levará a que PHP proporcione avisos con código perfectamente válido.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este asunto estableza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
"Please ask your server administrator to restart the web server." : "Pregúntelle ao administrador do servidor polo reinicio do servidor web..",
"PostgreSQL >= 9 required" : "Requírese PostgreSQL >= 9",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 1b8900c95f6..c9feefa2f53 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Pregúntelle ao administrador do servidor pola instalación do módulo.",
"PHP module %s not installed." : "O módulo PHP %s non está instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para surtir datos de código en bruto. Desde PHP 5.6 esto levará a que PHP proporcione avisos con código perfectamente válido.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este asunto estableza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
"Please ask your server administrator to restart the web server." : "Pregúntelle ao administrador do servidor polo reinicio do servidor web..",
"PostgreSQL >= 9 required" : "Requírese PostgreSQL >= 9",
diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js
index c7e561262b4..3c2df29120a 100644
--- a/lib/l10n/hr.js
+++ b/lib/l10n/hr.js
@@ -113,6 +113,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.",
"PHP module %s not installed." : "PHP modul %s nije instaliran.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Molimo zamolite svog administratora poslužitelja da ažurira PHP na najnoviju verziju.Vašu PHP verziju ownCloud i PHP zajednica više ne podržavaju.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?",
"Please ask your server administrator to restart the web server." : "Molimo zamolite svog administratora poslužitelja da ponovno pokrene web poslužitelj.",
"PostgreSQL >= 9 required" : "Potreban je PostgreSQL >= 9",
diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json
index d4cab3a16b7..372d5515966 100644
--- a/lib/l10n/hr.json
+++ b/lib/l10n/hr.json
@@ -111,6 +111,8 @@
"Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.",
"PHP module %s not installed." : "PHP modul %s nije instaliran.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Molimo zamolite svog administratora poslužitelja da ažurira PHP na najnoviju verziju.Vašu PHP verziju ownCloud i PHP zajednica više ne podržavaju.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?",
"Please ask your server administrator to restart the web server." : "Molimo zamolite svog administratora poslužitelja da ponovno pokrene web poslužitelj.",
"PostgreSQL >= 9 required" : "Potreban je PostgreSQL >= 9",
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js
index 55581474e8f..f1f645b1616 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu_HU.js
@@ -105,6 +105,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!",
"PHP module %s not installed." : "A %s PHP modul nincs telepítve.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Kérje meg a rendszergazdát, hogy frissítse a PHP-t újabb változatra! Ezt a PHP változatot már nem támogatja az ownCloud és a PHP fejlesztői közösség.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
"PHP modules have been installed, but they are still listed as missing?" : "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?",
"Please ask your server administrator to restart the web server." : "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 szükséges",
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
index cc95cceae5e..ac09b9d84ef 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu_HU.json
@@ -103,6 +103,8 @@
"Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!",
"PHP module %s not installed." : "A %s PHP modul nincs telepítve.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Kérje meg a rendszergazdát, hogy frissítse a PHP-t újabb változatra! Ezt a PHP változatot már nem támogatja az ownCloud és a PHP fejlesztői közösség.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
"PHP modules have been installed, but they are still listed as missing?" : "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?",
"Please ask your server administrator to restart the web server." : "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 szükséges",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 0ad97244098..072380ddf86 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -8,6 +8,15 @@ OC.L10N.register(
"Sample configuration detected" : "Konfigurasi sampel ditemukan",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
"PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.",
+ "PHP with a version lower than %s is required." : "Diperlukan PHP dengan versi yang lebh rendah dari %s.",
+ "Following databases are supported: %s" : "Berikut adalah basis data yang didukung: %s",
+ "The command line tool %s could not be found" : "Alat baris perintah %s tidak ditemukan",
+ "The library %s is not available." : "Pustaka %s tidak tersedia.",
+ "Library %s with a version higher than %s is required - available version %s." : "Diperlukan pustaka %s dengan versi yang lebih tinggi dari %s - versi yang tersedia %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "Diperlukan pustaka %s dengan versi yang lebih rendah dari %s - versi yang tersedia %s.",
+ "Following platforms are supported: %s" : "Berikut adalah platform yang didukung: %s",
+ "ownCloud %s or higher is required." : "Diperlukan ownCloud %s atau yang lebih tinggi.",
+ "ownCloud with a version lower than %s is required." : "Diperlukan ownCloud dengan versi yang lebih rendah dari %s.",
"Help" : "Bantuan",
"Personal" : "Pribadi",
"Settings" : "Pengaturan",
@@ -15,19 +24,22 @@ OC.L10N.register(
"Admin" : "Admin",
"Recommended" : "Direkomendasikan",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikasi \\\"%s\\\" tidak dapat diinstal karena tidak kompatibel denga versi ownCloud ini.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Aplikasi \\\"%s\\\" tidak dapat diinstal karena ketergantungan berikut tidak terpenuhi: %s",
"No app name specified" : "Tidak ada nama apl yang ditentukan",
"Unknown filetype" : "Tipe berkas tak dikenal",
"Invalid image" : "Gambar tidak sah",
"today" : "hari ini",
"yesterday" : "kemarin",
- "_%n day ago_::_%n days ago_" : [""],
+ "_%n day ago_::_%n days ago_" : ["%n hari yang lalu"],
"last month" : "bulan kemarin",
"_%n month ago_::_%n months ago_" : ["%n bulan yang lalu"],
"last year" : "tahun kemarin",
- "_%n year ago_::_%n years ago_" : [""],
+ "_%n year ago_::_%n years ago_" : ["%n tahun yang lalu"],
"_%n hour ago_::_%n hours ago_" : ["%n jam yang lalu"],
"_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"],
"seconds ago" : "beberapa detik yang lalu",
+ "Database Error" : "Basis Data Galat",
+ "Please contact your system administrator." : "Mohon hubungi administrator sistem Anda.",
"web services under your control" : "layanan web dalam kendali anda",
"App directory already exists" : "Direktori Apl sudah ada",
"Can't create app folder. Please fix permissions. %s" : "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s",
@@ -65,6 +77,7 @@ OC.L10N.register(
"Set an admin password." : "Tetapkan sandi admin.",
"Can't create or write into the data directory %s" : "Tidak dapat membuat atau menulis kedalam direktori data %s",
"%s shared »%s« with you" : "%s membagikan »%s« dengan anda",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Gagal berbagi %s, karena backend tidak mengizinkan berbagi dengan tipe %i",
"Sharing %s failed, because the file does not exist" : "Gagal membagikan %s, karena berkas tidak ada",
"You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
"Sharing %s failed, because the user %s is the item owner" : "Gagal membagikan %s, karena pengguna %s adalah pemilik item",
@@ -101,6 +114,9 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.",
"PHP module %s not installed." : "Module PHP %s tidak terinstal.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mohon tanyakan administrator Anda untuk memperbarui PHP ke versi terkini. Versi PHP Anda tidak lagi didukung oleh ownCloud dan komunitas PHP.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Untuk memperbaiki masalah ini, atur <code>always_populate_raw_post_data</code> menjadi <code>-1</code> pada berkas php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?",
"Please ask your server administrator to restart the web server." : "Mohon minta administrator Anda untuk menjalankan ulang server web.",
"PostgreSQL >= 9 required" : "Diperlukan PostgreSQL >= 9",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 26add369e59..6e9271e4ec5 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -6,6 +6,15 @@
"Sample configuration detected" : "Konfigurasi sampel ditemukan",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
"PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.",
+ "PHP with a version lower than %s is required." : "Diperlukan PHP dengan versi yang lebh rendah dari %s.",
+ "Following databases are supported: %s" : "Berikut adalah basis data yang didukung: %s",
+ "The command line tool %s could not be found" : "Alat baris perintah %s tidak ditemukan",
+ "The library %s is not available." : "Pustaka %s tidak tersedia.",
+ "Library %s with a version higher than %s is required - available version %s." : "Diperlukan pustaka %s dengan versi yang lebih tinggi dari %s - versi yang tersedia %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "Diperlukan pustaka %s dengan versi yang lebih rendah dari %s - versi yang tersedia %s.",
+ "Following platforms are supported: %s" : "Berikut adalah platform yang didukung: %s",
+ "ownCloud %s or higher is required." : "Diperlukan ownCloud %s atau yang lebih tinggi.",
+ "ownCloud with a version lower than %s is required." : "Diperlukan ownCloud dengan versi yang lebih rendah dari %s.",
"Help" : "Bantuan",
"Personal" : "Pribadi",
"Settings" : "Pengaturan",
@@ -13,19 +22,22 @@
"Admin" : "Admin",
"Recommended" : "Direkomendasikan",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikasi \\\"%s\\\" tidak dapat diinstal karena tidak kompatibel denga versi ownCloud ini.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Aplikasi \\\"%s\\\" tidak dapat diinstal karena ketergantungan berikut tidak terpenuhi: %s",
"No app name specified" : "Tidak ada nama apl yang ditentukan",
"Unknown filetype" : "Tipe berkas tak dikenal",
"Invalid image" : "Gambar tidak sah",
"today" : "hari ini",
"yesterday" : "kemarin",
- "_%n day ago_::_%n days ago_" : [""],
+ "_%n day ago_::_%n days ago_" : ["%n hari yang lalu"],
"last month" : "bulan kemarin",
"_%n month ago_::_%n months ago_" : ["%n bulan yang lalu"],
"last year" : "tahun kemarin",
- "_%n year ago_::_%n years ago_" : [""],
+ "_%n year ago_::_%n years ago_" : ["%n tahun yang lalu"],
"_%n hour ago_::_%n hours ago_" : ["%n jam yang lalu"],
"_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"],
"seconds ago" : "beberapa detik yang lalu",
+ "Database Error" : "Basis Data Galat",
+ "Please contact your system administrator." : "Mohon hubungi administrator sistem Anda.",
"web services under your control" : "layanan web dalam kendali anda",
"App directory already exists" : "Direktori Apl sudah ada",
"Can't create app folder. Please fix permissions. %s" : "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s",
@@ -63,6 +75,7 @@
"Set an admin password." : "Tetapkan sandi admin.",
"Can't create or write into the data directory %s" : "Tidak dapat membuat atau menulis kedalam direktori data %s",
"%s shared »%s« with you" : "%s membagikan »%s« dengan anda",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Gagal berbagi %s, karena backend tidak mengizinkan berbagi dengan tipe %i",
"Sharing %s failed, because the file does not exist" : "Gagal membagikan %s, karena berkas tidak ada",
"You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
"Sharing %s failed, because the user %s is the item owner" : "Gagal membagikan %s, karena pengguna %s adalah pemilik item",
@@ -99,6 +112,9 @@
"Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.",
"PHP module %s not installed." : "Module PHP %s tidak terinstal.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mohon tanyakan administrator Anda untuk memperbarui PHP ke versi terkini. Versi PHP Anda tidak lagi didukung oleh ownCloud dan komunitas PHP.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Untuk memperbaiki masalah ini, atur <code>always_populate_raw_post_data</code> menjadi <code>-1</code> pada berkas php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?",
"Please ask your server administrator to restart the web server." : "Mohon minta administrator Anda untuk menjalankan ulang server web.",
"PostgreSQL >= 9 required" : "Diperlukan PostgreSQL >= 9",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index 0d619211f0d..229bb8bd2ec 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Chiedi all'amministratore del tuo server di installare il modulo.",
"PHP module %s not installed." : "Il modulo PHP %s non è installato.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Chiedi al tuo amministratore di aggiornare PHP all'ultima versione. La tua versione di PHP non è più supportata da ownCloud e dalla comunità di PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP è configurato per popolare dati grezzi di POST. A partire da PHP 5.6 saranno generati avvisi di PHP relativi a codice completamente valido.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Per correggere questo problema, imposta <code>always_populate_raw_post_data</code> a <code>-1</code> nel tuo php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?",
"Please ask your server administrator to restart the web server." : "Chiedi all'amministratore di riavviare il server web.",
"PostgreSQL >= 9 required" : "Richiesto PostgreSQL >= 9",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index aea35699411..8fca8b4684c 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Chiedi all'amministratore del tuo server di installare il modulo.",
"PHP module %s not installed." : "Il modulo PHP %s non è installato.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Chiedi al tuo amministratore di aggiornare PHP all'ultima versione. La tua versione di PHP non è più supportata da ownCloud e dalla comunità di PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP è configurato per popolare dati grezzi di POST. A partire da PHP 5.6 saranno generati avvisi di PHP relativi a codice completamente valido.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Per correggere questo problema, imposta <code>always_populate_raw_post_data</code> a <code>-1</code> nel tuo php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?",
"Please ask your server administrator to restart the web server." : "Chiedi all'amministratore di riavviare il server web.",
"PostgreSQL >= 9 required" : "Richiesto PostgreSQL >= 9",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 0d52b2c28e6..bf0e4f4b4cc 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "サーバー管理者にモジュールのインストールを依頼してください。",
"PHP module %s not installed." : "PHP のモジュール %s がインストールされていません。",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "PHPを最新バージョンに更新するようサーバー管理者に依頼してください。現在のPHPのバージョンは、ownCloudおよびPHPコミュニティでサポートされていません。",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP で、populate raw post data が設定されています。この非推奨コードに対してPHP 5.6 から PHPの警告が表示されるようになりました。",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "この問題を修正するには、php.ini ファイルの<code>always_populate_raw_post_data</code> を <code>-1</code> に設定してください。",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。",
"PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか?",
"Please ask your server administrator to restart the web server." : "サーバー管理者にWebサーバーを再起動するよう依頼してください。",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 が必要です",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index c33f9f2419d..6e3749cd3b7 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "サーバー管理者にモジュールのインストールを依頼してください。",
"PHP module %s not installed." : "PHP のモジュール %s がインストールされていません。",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "PHPを最新バージョンに更新するようサーバー管理者に依頼してください。現在のPHPのバージョンは、ownCloudおよびPHPコミュニティでサポートされていません。",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP で、populate raw post data が設定されています。この非推奨コードに対してPHP 5.6 から PHPの警告が表示されるようになりました。",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "この問題を修正するには、php.ini ファイルの<code>always_populate_raw_post_data</code> を <code>-1</code> に設定してください。",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。",
"PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか?",
"Please ask your server administrator to restart the web server." : "サーバー管理者にWebサーバーを再起動するよう依頼してください。",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 が必要です",
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index aaf784585f0..41f87248eef 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "서버 관리자에게 모듈 설치를 요청하십시오.",
"PHP module %s not installed." : "PHP 모듈 %s이(가) 설치되지 않았습니다.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "서버 관리자에게 PHP 버전을 최신으로 업그레이드해 달라고 요청하십시오. 현재 사용 중인 PHP 버전은 ownCloud 및 PHP 커뮤니티에서 지원되지 않습니다.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP에서 원시 POST 데이터 값을 채워 넣도록 구성되어 있지 않습니다. 이 경우 PHP 5.6 버전부터는 완전히 유효한 코드에서도 알림 메시지를 발생시킵니다.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "이 문제를 해결하러면 php.ini 설정 파일에서 <code>always_populate_raw_post_data</code>의 값을 <code>-1</code>로 설정하십시오.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP 모듈이 설치되었지만 여전히 없는 것으로 나타납니까?",
"Please ask your server administrator to restart the web server." : "서버 관리자에게 웹 서버 재시작을 요청하십시오.",
"PostgreSQL >= 9 required" : "PostgreSQL 버전 9 이상이 필요합니다",
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index f1ab6720850..768dbeafefe 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "서버 관리자에게 모듈 설치를 요청하십시오.",
"PHP module %s not installed." : "PHP 모듈 %s이(가) 설치되지 않았습니다.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "서버 관리자에게 PHP 버전을 최신으로 업그레이드해 달라고 요청하십시오. 현재 사용 중인 PHP 버전은 ownCloud 및 PHP 커뮤니티에서 지원되지 않습니다.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP에서 원시 POST 데이터 값을 채워 넣도록 구성되어 있지 않습니다. 이 경우 PHP 5.6 버전부터는 완전히 유효한 코드에서도 알림 메시지를 발생시킵니다.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "이 문제를 해결하러면 php.ini 설정 파일에서 <code>always_populate_raw_post_data</code>의 값을 <code>-1</code>로 설정하십시오.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP 모듈이 설치되었지만 여전히 없는 것으로 나타납니까?",
"Please ask your server administrator to restart the web server." : "서버 관리자에게 웹 서버 재시작을 요청하십시오.",
"PostgreSQL >= 9 required" : "PostgreSQL 버전 9 이상이 필요합니다",
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index d3140df2694..22f50896cf8 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -119,6 +119,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Be server-administratoren om å installere modulen.",
"PHP module %s not installed." : "PHP-modul %s er ikke installert.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Be server-administratoren om å oppdatere PHP til nyeste versjon. PHP-versjonen du bruker støttes ikke lenger av ownCloud og PHP-fellesskapet.",
+ "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.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?",
"Please ask your server administrator to restart the web server." : "Be server-administratoren om å starte web-serveren på nytt.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 kreves",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index 07caa219df7..201dfeeea69 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -117,6 +117,8 @@
"Please ask your server administrator to install the module." : "Be server-administratoren om å installere modulen.",
"PHP module %s not installed." : "PHP-modul %s er ikke installert.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Be server-administratoren om å oppdatere PHP til nyeste versjon. PHP-versjonen du bruker støttes ikke lenger av ownCloud og PHP-fellesskapet.",
+ "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.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?",
"Please ask your server administrator to restart the web server." : "Be server-administratoren om å starte web-serveren på nytt.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 kreves",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 848fcb03d22..b44fd91d594 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Vraag uw beheerder om de module te installeren.",
"PHP module %s not installed." : "PHP module %s niet geïnstalleerd.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vraag uw beheerder om PHP bij te werken tot de laatste versie. Uw PHP versie wordt niet langer ondersteund door ownCloud en de PHP community.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP is geconfigureerd om ruwe data van berichten te vullen. Vanaf PHP 5.6 leidt dit tot PHP meldingen voor echt wel geldige code.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Om dit op te lossen stel de waarde <code>always_populate_raw_post_data</code> in op <code>-1</code> in php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?",
"Please ask your server administrator to restart the web server." : "Vraag uw beheerder de webserver opnieuw op te starten.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 vereist",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 706ecc301a9..e453aa0f6a0 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Vraag uw beheerder om de module te installeren.",
"PHP module %s not installed." : "PHP module %s niet geïnstalleerd.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vraag uw beheerder om PHP bij te werken tot de laatste versie. Uw PHP versie wordt niet langer ondersteund door ownCloud en de PHP community.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP is geconfigureerd om ruwe data van berichten te vullen. Vanaf PHP 5.6 leidt dit tot PHP meldingen voor echt wel geldige code.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Om dit op te lossen stel de waarde <code>always_populate_raw_post_data</code> in op <code>-1</code> in php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?",
"Please ask your server administrator to restart the web server." : "Vraag uw beheerder de webserver opnieuw op te starten.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 vereist",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index ff1205a8b95..9663e705324 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -110,6 +110,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.",
"PHP module %s not installed." : "Moduł PHP %s nie jest zainstalowany.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Proszę poproś administratora serwera aby zaktualizował PHP do najnowszej wersji. Twoja wersja PHP nie jest już dłużej wspierana przez ownCloud i społeczność PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?",
"Please ask your server administrator to restart the web server." : "Poproś administratora serwera o restart serwera www.",
"PostgreSQL >= 9 required" : "Wymagany PostgreSQL >= 9",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index 7748bd31743..575f0fddf31 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -108,6 +108,8 @@
"Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.",
"PHP module %s not installed." : "Moduł PHP %s nie jest zainstalowany.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Proszę poproś administratora serwera aby zaktualizował PHP do najnowszej wersji. Twoja wersja PHP nie jest już dłużej wspierana przez ownCloud i społeczność PHP.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?",
"Please ask your server administrator to restart the web server." : "Poproś administratora serwera o restart serwera www.",
"PostgreSQL >= 9 required" : "Wymagany PostgreSQL >= 9",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 2de16fc9669..f3d765fa0a9 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -119,6 +119,9 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Por favor, peça ao seu administrador do servidor para instalar o módulo.",
"PHP module %s not installed." : "Módulo PHP %s não instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, peça ao seu administrador do servidor para atualizar o PHP para a versão mais recente. A sua versão do PHP não é mais suportado pelo ownCloud e a comunidade PHP.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para corrigir esse problema configure <code> always_populate_raw_post_data </code> para <code> -1 </code> em seu arquivo de configuração php.ini",
+ "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.",
"PHP modules have been installed, but they are still listed as missing?" : "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
"Please ask your server administrator to restart the web server." : "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 requirido",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index cb9493386d0..e2f27123d3f 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -117,6 +117,9 @@
"Please ask your server administrator to install the module." : "Por favor, peça ao seu administrador do servidor para instalar o módulo.",
"PHP module %s not installed." : "Módulo PHP %s não instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, peça ao seu administrador do servidor para atualizar o PHP para a versão mais recente. A sua versão do PHP não é mais suportado pelo ownCloud e a comunidade PHP.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para corrigir esse problema configure <code> always_populate_raw_post_data </code> para <code> -1 </code> em seu arquivo de configuração php.ini",
+ "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.",
"PHP modules have been installed, but they are still listed as missing?" : "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
"Please ask your server administrator to restart the web server." : "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 requirido",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 5629ffc2037..5abfa3f57cd 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -8,6 +8,15 @@ OC.L10N.register(
"Sample configuration detected" : "Exemplo de configuração detectada",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
"PHP %s or higher is required." : "Necessário PHP %s ou maior.",
+ "PHP with a version lower than %s is required." : "É necessário um PHP com uma versão inferir a %s.",
+ "Following databases are supported: %s" : "As seguintes bases de dados são suportadas: %s",
+ "The command line tool %s could not be found" : "A ferramenta de linha de comento %s não foi encontrada",
+ "The library %s is not available." : "A biblioteca %s não está disponível.",
+ "Library %s with a version higher than %s is required - available version %s." : "É necessário que a biblioteca %s tenha uma versão superior a %s - versão disponível: %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "É necessário que a biblioteca %s tenha uma versão inferior a %s - versão disponível: %s.",
+ "Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
+ "ownCloud %s or higher is required." : "É necessário ownCloud %s ou superior.",
+ "ownCloud with a version lower than %s is required." : "É necessário uma versão do ownCloud inferior a %s.",
"Help" : "Ajuda",
"Personal" : "Pessoal",
"Settings" : "Configurações",
@@ -15,16 +24,17 @@ OC.L10N.register(
"Admin" : "Admin",
"Recommended" : "Recomendado",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "A Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do owncloud.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "A aplicação \\\"%s\\\" não pode ser instalada porque as seguintes dependências não podem ser realizadas: %s",
"No app name specified" : "O nome da aplicação não foi especificado",
"Unknown filetype" : "Ficheiro desconhecido",
"Invalid image" : "Imagem inválida",
"today" : "hoje",
"yesterday" : "ontem",
- "_%n day ago_::_%n days ago_" : ["",""],
+ "_%n day ago_::_%n days ago_" : ["%n dia atrás","%n dias atrás"],
"last month" : "ultímo mês",
"_%n month ago_::_%n months ago_" : ["","%n meses atrás"],
"last year" : "ano passado",
- "_%n year ago_::_%n years ago_" : ["",""],
+ "_%n year ago_::_%n years ago_" : ["%n ano atrás","%n anos atrás"],
"_%n hour ago_::_%n hours ago_" : ["","%n horas atrás"],
"_%n minute ago_::_%n minutes ago_" : ["","%n minutos atrás"],
"seconds ago" : "Minutos atrás",
@@ -67,6 +77,7 @@ OC.L10N.register(
"Set an admin password." : "Definiar uma password de administrador",
"Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
"%s shared »%s« with you" : "%s partilhado »%s« consigo",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "A partilha de %s falhou porque não são autorizadas partilhas do tipo %i",
"Sharing %s failed, because the file does not exist" : "A partilha de %s falhou, porque o ficheiro não existe",
"You are not allowed to share %s" : "Não está autorizado a partilhar %s",
"Sharing %s failed, because the user %s is the item owner" : "A partilha %s falhou, porque o utilizador %s é o proprietário",
@@ -77,6 +88,7 @@ OC.L10N.register(
"Sharing %s failed, because %s is not a member of the group %s" : "A partilha %s falhou, porque o utilizador %s não é membro do grupo %s",
"You need to provide a password to create a public link, only protected links are allowed" : "Necessita de fornecer a senha para criar um link publico, só são permitidos links protegidos",
"Sharing %s failed, because sharing with links is not allowed" : "A partilha de %s falhou, porque partilhar com links não é permitido",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "A partilha de %s falhou, não foi possível encontrar %s. É possível que o servidor esteja inacessível.",
"Share type %s is not valid for %s" : "O tipo de partilha %s não é válido para %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
"Setting permissions for %s failed, because the item was not found" : "Definir permissões para %s falhou, porque o item não foi encontrado",
@@ -107,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Por favor pergunte ao seu administrador do servidor para instalar o modulo.",
"PHP module %s not installed." : "O modulo %s PHP não está instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor pessa ao seu administrador de servidor para actualizar o PHP para a ultima versão. A sua versão de PHP não é mais suportada pelo owncloud e a comunidade PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "O PHP está configurado para popular dados raw post. Desde o PHP 5.6 isto levará a que o PHP mostre avisos sobre código perfeitamente válido.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para corrigir este problema altere <code>always_populate_raw_post_data</code> para <code>-1</code> no seu php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
"PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
"Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.",
"PostgreSQL >= 9 required" : "Necessita PostgreSQL >= 9",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 7f1a1e5e1bf..fff334cb3b0 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -6,6 +6,15 @@
"Sample configuration detected" : "Exemplo de configuração detectada",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
"PHP %s or higher is required." : "Necessário PHP %s ou maior.",
+ "PHP with a version lower than %s is required." : "É necessário um PHP com uma versão inferir a %s.",
+ "Following databases are supported: %s" : "As seguintes bases de dados são suportadas: %s",
+ "The command line tool %s could not be found" : "A ferramenta de linha de comento %s não foi encontrada",
+ "The library %s is not available." : "A biblioteca %s não está disponível.",
+ "Library %s with a version higher than %s is required - available version %s." : "É necessário que a biblioteca %s tenha uma versão superior a %s - versão disponível: %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "É necessário que a biblioteca %s tenha uma versão inferior a %s - versão disponível: %s.",
+ "Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
+ "ownCloud %s or higher is required." : "É necessário ownCloud %s ou superior.",
+ "ownCloud with a version lower than %s is required." : "É necessário uma versão do ownCloud inferior a %s.",
"Help" : "Ajuda",
"Personal" : "Pessoal",
"Settings" : "Configurações",
@@ -13,16 +22,17 @@
"Admin" : "Admin",
"Recommended" : "Recomendado",
"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "A Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do owncloud.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "A aplicação \\\"%s\\\" não pode ser instalada porque as seguintes dependências não podem ser realizadas: %s",
"No app name specified" : "O nome da aplicação não foi especificado",
"Unknown filetype" : "Ficheiro desconhecido",
"Invalid image" : "Imagem inválida",
"today" : "hoje",
"yesterday" : "ontem",
- "_%n day ago_::_%n days ago_" : ["",""],
+ "_%n day ago_::_%n days ago_" : ["%n dia atrás","%n dias atrás"],
"last month" : "ultímo mês",
"_%n month ago_::_%n months ago_" : ["","%n meses atrás"],
"last year" : "ano passado",
- "_%n year ago_::_%n years ago_" : ["",""],
+ "_%n year ago_::_%n years ago_" : ["%n ano atrás","%n anos atrás"],
"_%n hour ago_::_%n hours ago_" : ["","%n horas atrás"],
"_%n minute ago_::_%n minutes ago_" : ["","%n minutos atrás"],
"seconds ago" : "Minutos atrás",
@@ -65,6 +75,7 @@
"Set an admin password." : "Definiar uma password de administrador",
"Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
"%s shared »%s« with you" : "%s partilhado »%s« consigo",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "A partilha de %s falhou porque não são autorizadas partilhas do tipo %i",
"Sharing %s failed, because the file does not exist" : "A partilha de %s falhou, porque o ficheiro não existe",
"You are not allowed to share %s" : "Não está autorizado a partilhar %s",
"Sharing %s failed, because the user %s is the item owner" : "A partilha %s falhou, porque o utilizador %s é o proprietário",
@@ -75,6 +86,7 @@
"Sharing %s failed, because %s is not a member of the group %s" : "A partilha %s falhou, porque o utilizador %s não é membro do grupo %s",
"You need to provide a password to create a public link, only protected links are allowed" : "Necessita de fornecer a senha para criar um link publico, só são permitidos links protegidos",
"Sharing %s failed, because sharing with links is not allowed" : "A partilha de %s falhou, porque partilhar com links não é permitido",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "A partilha de %s falhou, não foi possível encontrar %s. É possível que o servidor esteja inacessível.",
"Share type %s is not valid for %s" : "O tipo de partilha %s não é válido para %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
"Setting permissions for %s failed, because the item was not found" : "Definir permissões para %s falhou, porque o item não foi encontrado",
@@ -105,6 +117,10 @@
"Please ask your server administrator to install the module." : "Por favor pergunte ao seu administrador do servidor para instalar o modulo.",
"PHP module %s not installed." : "O modulo %s PHP não está instalado.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor pessa ao seu administrador de servidor para actualizar o PHP para a ultima versão. A sua versão de PHP não é mais suportada pelo owncloud e a comunidade PHP.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "O PHP está configurado para popular dados raw post. Desde o PHP 5.6 isto levará a que o PHP mostre avisos sobre código perfeitamente válido.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para corrigir este problema altere <code>always_populate_raw_post_data</code> para <code>-1</code> no seu php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
"PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
"Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.",
"PostgreSQL >= 9 required" : "Necessita PostgreSQL >= 9",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 90d9ae45421..79a53ab3302 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -1,12 +1,12 @@
OC.L10N.register(
"lib",
{
- "Cannot write into \"config\" directory!" : "Запись в каталог \"config\" невозможна",
- "This can usually be fixed by giving the webserver write access to the config directory" : "Обычно это можно исправить, предоставив веб-серверу права на запись в каталоге конфигурации",
+ "Cannot write into \"config\" directory!" : "Запись в каталог \"config\" невозможна!",
+ "This can usually be fixed by giving the webserver write access to the config directory" : "Обычно это можно исправить предоставив веб-серверу права на запись в каталоге конфигурации",
"See %s" : "Просмотр %s",
- "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталоге конфигурации%s.",
+ "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить %sпредоставив веб-серверу права на запись в каталоге конфигурации%s.",
"Sample configuration detected" : "Обнаружена конфигурация из примера",
- "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите доументацию перед внесением изменений в файл config.php",
+ "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите документацию перед внесением изменений в файл config.php",
"PHP %s or higher is required." : "Требуется PHP %s или выше",
"PHP with a version lower than %s is required." : "Требуется версия PHP ниже %s.",
"Following databases are supported: %s" : "Поддерживаются следующие СУБД: %s",
@@ -47,7 +47,7 @@ OC.L10N.register(
"No href specified when installing app from http" : "Не указан атрибут href при установке приложения через http",
"No path specified when installing app from local file" : "Не указан путь при установке приложения из локального файла",
"Archives of type %s are not supported" : "Архивы %s не поддерживаются",
- "Failed to open archive when installing app" : "Не возможно открыть архив при установке приложения",
+ "Failed to open archive when installing app" : "Ошибка открытия архива при установке приложения",
"App does not provide an info.xml file" : "Приложение не имеет файла info.xml",
"App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
@@ -65,11 +65,11 @@ OC.L10N.register(
"MySQL/MariaDB username and/or password not valid" : "Неверное имя пользователя и/или пароль MySQL/MariaDB",
"DB Error: \"%s\"" : "Ошибка БД: \"%s\"",
"Offending command was: \"%s\"" : "Вызываемая команда была: \"%s\"",
- "MySQL/MariaDB user '%s'@'localhost' exists already." : "Пользователь MySQL '%s'@'localhost' уже существует.",
+ "MySQL/MariaDB user '%s'@'localhost' exists already." : "Пользователь MySQL/MariaDB '%s'@'localhost' уже существует.",
"Drop this user from MySQL/MariaDB" : "Удалить данного участника из MySQL/MariaDB",
- "MySQL/MariaDB user '%s'@'%%' already exists" : "Пользователь MySQL '%s'@'%%' уже существует.",
+ "MySQL/MariaDB user '%s'@'%%' already exists" : "Пользователь MySQL/MariaDB '%s'@'%%' уже существует.",
"Drop this user from MySQL/MariaDB." : "Удалить данного участника из MySQL/MariaDB.",
- "Oracle connection could not be established" : "соединение с Oracle не может быть установлено",
+ "Oracle connection could not be established" : "Соединение с Oracle не может быть установлено",
"Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle",
"Offending command was: \"%s\", name: %s, password: %s" : "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
"PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL",
@@ -77,10 +77,10 @@ OC.L10N.register(
"Set an admin password." : "Задать пароль для admin.",
"Can't create or write into the data directory %s" : "Невозможно создать или записать в каталог данных %s",
"%s shared »%s« with you" : "%s поделился »%s« с вами",
- "Sharing %s failed, because the backend does not allow shares from type %i" : "Не удалось поделиться %s, бекэнд общего доступа не допускает публикации из элементов типа %i",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Не удалось поделиться %s, общий доступ не допускает публикации из элементов типа %i",
"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 is the item owner" : "Не удалось поделиться %s, пользователь %s владелец этого элемента",
"Sharing %s failed, because the user %s does not exist" : "Не удалось поделиться %s, пользователь %s не существует.",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Не удалось поделиться %s, пользователь %s не состоит в какой-либо группе в которой состоит %s",
"Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться %s, пользователь %s уже имеет доступ к этому элементу",
@@ -90,45 +90,49 @@ OC.L10N.register(
"Sharing %s failed, because sharing with links is not allowed" : "Не удалось поделиться %s, открытие доступа по ссылке запрещено",
"Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не удалось поделиться %s, не удалось найти %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 , элемент не найден.",
- "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Невозможно установить дату устаревания. Общие ресурсы не могут устареть позже, чем %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, элемент не найден.",
+ "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Невозможно установить дату истечения. Общие ресурсы не могут устареть позже %s с момента их публикации.",
"Cannot set expiration date. Expiration date is in the past" : "Невозможно установить дату окончания. Дата окончания в прошлом.",
"Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бэкенд общего доступа %s должен реализовывать интерфейс OCP\\Share_Backend",
- "Sharing backend %s 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 the permissions exceed permissions granted to %s" : "Не удалось поделиться %s, права %s превышают предоставленные права доступа ",
+ "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Не удалось поделиться %s, права превышают предоставленные права доступа %s",
"Sharing %s failed, because resharing is not allowed" : "Не удалось поделиться %s, повторное открытие доступа запрещено",
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s",
"Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.",
"Could not find category \"%s\"" : "Категория \"%s\" не найдена",
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"",
"A valid username must be provided" : "Укажите правильное имя пользователя",
- "A valid password must be provided" : "Укажите валидный пароль",
+ "A valid password must be provided" : "Укажите правильный пароль",
"The username is already being used" : "Имя пользователя уже используется",
"No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой каталог%s.",
"Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна",
"Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна",
- "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив appstore в файле конфигурации.",
+ "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив хранилище программ в файле конфигурации.",
"Cannot create \"data\" directory (%s)" : "Невозможно создать каталог \"data\" (%s)",
"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневом каталоге.",
- "Setting locale to %s failed" : "Установка локали в %s не удалась",
+ "Setting locale to %s failed" : "Установка локали %s не удалась",
"Please install one of these locales on your system and restart your webserver." : "Установите один из этих языковых пакетов на вашу систему и перезапустите веб-сервер.",
"Please ask your server administrator to install the module." : "Пожалуйста, попростите администратора сервера установить модуль.",
"PHP module %s not installed." : "Не установлен PHP-модуль %s.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Пожалуйста, обратитесь к администратору сервера, чтобы обновить PHP до последней версии. Установленная версия PHP больше не поддерживается ownCloud и сообществом PHP.",
- "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP был установлены, но все еще в списке как недостающие?",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "В PHP включена директива \"always_populate_raw_post_data\". PHP версии 5.6 и выше, при включенной директиве, добавляет уведомления в журнал даже для абсолютно рабочего кода.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Что-бы исправить эту ошибку, укажите значение <code>-1</code> в качестве значения параметра <code>always_populate_raw_post_data</code> в вашем php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
+ "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP были установлены, но они все еще перечислены как недостающие?",
"Please ask your server administrator to restart the web server." : "Пожалуйста, попросите вашего администратора перезапустить веб-сервер.",
"PostgreSQL >= 9 required" : "Требуется PostgreSQL >= 9",
"Please upgrade your database version" : "Обновите базу данных",
"Error occurred while checking PostgreSQL version" : "Произошла ошибка при проверке версии PostgreSQL",
"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Убедитесь что версия PostgreSQL >= 9 или проверьте журналы для получения дополнительной информацией об ошибке",
- "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Измените права доступа на 0770, что-бы другие пользователи не могли получить список файлов этого каталога.",
+ "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Измените права доступа на 0770, чтобы другие пользователи не могли получить список файлов этого каталога.",
"Data directory (%s) is readable by other users" : "Каталог данных (%s) доступен для чтения другим пользователям",
"Data directory (%s) is invalid" : "Каталог данных (%s) не верен",
"Please check that the data directory contains a file \".ocdata\" in its root." : "Убедитесь, что файл \".ocdata\" присутствует в корне каталога данных.",
- "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d на \"%s\""
+ "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d для \"%s\""
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 03b3f3fd2fb..8863fe4c0a9 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -1,10 +1,10 @@
{ "translations": {
- "Cannot write into \"config\" directory!" : "Запись в каталог \"config\" невозможна",
- "This can usually be fixed by giving the webserver write access to the config directory" : "Обычно это можно исправить, предоставив веб-серверу права на запись в каталоге конфигурации",
+ "Cannot write into \"config\" directory!" : "Запись в каталог \"config\" невозможна!",
+ "This can usually be fixed by giving the webserver write access to the config directory" : "Обычно это можно исправить предоставив веб-серверу права на запись в каталоге конфигурации",
"See %s" : "Просмотр %s",
- "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталоге конфигурации%s.",
+ "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить %sпредоставив веб-серверу права на запись в каталоге конфигурации%s.",
"Sample configuration detected" : "Обнаружена конфигурация из примера",
- "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите доументацию перед внесением изменений в файл config.php",
+ "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите документацию перед внесением изменений в файл config.php",
"PHP %s or higher is required." : "Требуется PHP %s или выше",
"PHP with a version lower than %s is required." : "Требуется версия PHP ниже %s.",
"Following databases are supported: %s" : "Поддерживаются следующие СУБД: %s",
@@ -45,7 +45,7 @@
"No href specified when installing app from http" : "Не указан атрибут href при установке приложения через http",
"No path specified when installing app from local file" : "Не указан путь при установке приложения из локального файла",
"Archives of type %s are not supported" : "Архивы %s не поддерживаются",
- "Failed to open archive when installing app" : "Не возможно открыть архив при установке приложения",
+ "Failed to open archive when installing app" : "Ошибка открытия архива при установке приложения",
"App does not provide an info.xml file" : "Приложение не имеет файла info.xml",
"App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
@@ -63,11 +63,11 @@
"MySQL/MariaDB username and/or password not valid" : "Неверное имя пользователя и/или пароль MySQL/MariaDB",
"DB Error: \"%s\"" : "Ошибка БД: \"%s\"",
"Offending command was: \"%s\"" : "Вызываемая команда была: \"%s\"",
- "MySQL/MariaDB user '%s'@'localhost' exists already." : "Пользователь MySQL '%s'@'localhost' уже существует.",
+ "MySQL/MariaDB user '%s'@'localhost' exists already." : "Пользователь MySQL/MariaDB '%s'@'localhost' уже существует.",
"Drop this user from MySQL/MariaDB" : "Удалить данного участника из MySQL/MariaDB",
- "MySQL/MariaDB user '%s'@'%%' already exists" : "Пользователь MySQL '%s'@'%%' уже существует.",
+ "MySQL/MariaDB user '%s'@'%%' already exists" : "Пользователь MySQL/MariaDB '%s'@'%%' уже существует.",
"Drop this user from MySQL/MariaDB." : "Удалить данного участника из MySQL/MariaDB.",
- "Oracle connection could not be established" : "соединение с Oracle не может быть установлено",
+ "Oracle connection could not be established" : "Соединение с Oracle не может быть установлено",
"Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle",
"Offending command was: \"%s\", name: %s, password: %s" : "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
"PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL",
@@ -75,10 +75,10 @@
"Set an admin password." : "Задать пароль для admin.",
"Can't create or write into the data directory %s" : "Невозможно создать или записать в каталог данных %s",
"%s shared »%s« with you" : "%s поделился »%s« с вами",
- "Sharing %s failed, because the backend does not allow shares from type %i" : "Не удалось поделиться %s, бекэнд общего доступа не допускает публикации из элементов типа %i",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Не удалось поделиться %s, общий доступ не допускает публикации из элементов типа %i",
"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 is the item owner" : "Не удалось поделиться %s, пользователь %s владелец этого элемента",
"Sharing %s failed, because the user %s does not exist" : "Не удалось поделиться %s, пользователь %s не существует.",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Не удалось поделиться %s, пользователь %s не состоит в какой-либо группе в которой состоит %s",
"Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться %s, пользователь %s уже имеет доступ к этому элементу",
@@ -88,45 +88,49 @@
"Sharing %s failed, because sharing with links is not allowed" : "Не удалось поделиться %s, открытие доступа по ссылке запрещено",
"Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не удалось поделиться %s, не удалось найти %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 , элемент не найден.",
- "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Невозможно установить дату устаревания. Общие ресурсы не могут устареть позже, чем %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, элемент не найден.",
+ "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Невозможно установить дату истечения. Общие ресурсы не могут устареть позже %s с момента их публикации.",
"Cannot set expiration date. Expiration date is in the past" : "Невозможно установить дату окончания. Дата окончания в прошлом.",
"Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бэкенд общего доступа %s должен реализовывать интерфейс OCP\\Share_Backend",
- "Sharing backend %s 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 the permissions exceed permissions granted to %s" : "Не удалось поделиться %s, права %s превышают предоставленные права доступа ",
+ "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Не удалось поделиться %s, права превышают предоставленные права доступа %s",
"Sharing %s failed, because resharing is not allowed" : "Не удалось поделиться %s, повторное открытие доступа запрещено",
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s",
"Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.",
"Could not find category \"%s\"" : "Категория \"%s\" не найдена",
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"",
"A valid username must be provided" : "Укажите правильное имя пользователя",
- "A valid password must be provided" : "Укажите валидный пароль",
+ "A valid password must be provided" : "Укажите правильный пароль",
"The username is already being used" : "Имя пользователя уже используется",
"No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой каталог%s.",
"Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна",
"Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна",
- "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив appstore в файле конфигурации.",
+ "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив хранилище программ в файле конфигурации.",
"Cannot create \"data\" directory (%s)" : "Невозможно создать каталог \"data\" (%s)",
"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневом каталоге.",
- "Setting locale to %s failed" : "Установка локали в %s не удалась",
+ "Setting locale to %s failed" : "Установка локали %s не удалась",
"Please install one of these locales on your system and restart your webserver." : "Установите один из этих языковых пакетов на вашу систему и перезапустите веб-сервер.",
"Please ask your server administrator to install the module." : "Пожалуйста, попростите администратора сервера установить модуль.",
"PHP module %s not installed." : "Не установлен PHP-модуль %s.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Пожалуйста, обратитесь к администратору сервера, чтобы обновить PHP до последней версии. Установленная версия PHP больше не поддерживается ownCloud и сообществом PHP.",
- "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP был установлены, но все еще в списке как недостающие?",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "В PHP включена директива \"always_populate_raw_post_data\". PHP версии 5.6 и выше, при включенной директиве, добавляет уведомления в журнал даже для абсолютно рабочего кода.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Что-бы исправить эту ошибку, укажите значение <code>-1</code> в качестве значения параметра <code>always_populate_raw_post_data</code> в вашем php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
+ "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP были установлены, но они все еще перечислены как недостающие?",
"Please ask your server administrator to restart the web server." : "Пожалуйста, попросите вашего администратора перезапустить веб-сервер.",
"PostgreSQL >= 9 required" : "Требуется PostgreSQL >= 9",
"Please upgrade your database version" : "Обновите базу данных",
"Error occurred while checking PostgreSQL version" : "Произошла ошибка при проверке версии PostgreSQL",
"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Убедитесь что версия PostgreSQL >= 9 или проверьте журналы для получения дополнительной информацией об ошибке",
- "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Измените права доступа на 0770, что-бы другие пользователи не могли получить список файлов этого каталога.",
+ "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Измените права доступа на 0770, чтобы другие пользователи не могли получить список файлов этого каталога.",
"Data directory (%s) is readable by other users" : "Каталог данных (%s) доступен для чтения другим пользователям",
"Data directory (%s) is invalid" : "Каталог данных (%s) не верен",
"Please check that the data directory contains a file \".ocdata\" in its root." : "Убедитесь, что файл \".ocdata\" присутствует в корне каталога данных.",
- "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d на \"%s\""
+ "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d для \"%s\""
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index a848a084bf8..47b404ff4a1 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -2,13 +2,21 @@ OC.L10N.register(
"lib",
{
"Cannot write into \"config\" directory!" : "Nie je možné zapisovat do priečinka \"config\"!",
- "This can usually be fixed by giving the webserver write access to the config directory" : "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou.",
+ "This can usually be fixed by giving the webserver write access to the config directory" : "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis do priečinka s konfiguráciou.",
"See %s" : "Pozri %s",
- "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
+ "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
"Sample configuration detected" : "Detekovaná bola vzorová konfigurácia",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
"PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.",
"PHP with a version lower than %s is required." : "PHP je vyžadované vo vyššej verzii ako %s.",
+ "Following databases are supported: %s" : "Podporované sú tieto databázy: %s",
+ "The command line tool %s could not be found" : "Nástroj príkazového riadka %s nebol nájdený",
+ "The library %s is not available." : "Knižnica %s je nedostupná.",
+ "Library %s with a version higher than %s is required - available version %s." : "Požadovaná je knižnica %s vo vyššej verzii ako %s - dostupná verzia %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "Požadovaná je knižnica %s v nižšej verzii ako %s - dostupná verzia %s.",
+ "Following platforms are supported: %s" : "Podporované sú nasledovné systémy: %s",
+ "ownCloud %s or higher is required." : "Požadovaná verzia ownCloudu %s alebo vyššia.",
+ "ownCloud with a version lower than %s is required." : "ownCloud je vyžadovaný v nižšej verzii ako %s.",
"Help" : "Pomoc",
"Personal" : "Osobné",
"Settings" : "Nastavenia",
@@ -16,6 +24,7 @@ OC.L10N.register(
"Admin" : "Administrátor",
"Recommended" : "Odporúčané",
"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.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti: %s",
"No app name specified" : "Nešpecifikované meno aplikácie",
"Unknown filetype" : "Neznámy typ súboru",
"Invalid image" : "Chybný obrázok",
@@ -29,7 +38,7 @@ OC.L10N.register(
"_%n hour ago_::_%n hours ago_" : ["pred %n hodinou","pred %n hodinami","pred %n hodinami"],
"_%n minute ago_::_%n minutes ago_" : ["pred %n minútou","pred %n minútami","pred %n minútami"],
"seconds ago" : "pred sekundami",
- "Database Error" : "Error databázy",
+ "Database Error" : "Chyba databázy",
"Please contact your system administrator." : "Prosím kontaktujte administrátora.",
"web services under your control" : "webové služby pod Vašou kontrolou",
"App directory already exists" : "Aplikačný priečinok už existuje",
@@ -42,7 +51,7 @@ OC.L10N.register(
"App does not provide an info.xml file" : "Aplikácia neposkytuje súbor info.xml",
"App can't be installed because of not allowed code in the App" : "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
- "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
+ "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje značku<shipped>true</shipped>, ktorá nie je povolená pre nedodávané aplikácie",
"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
"Application is not enabled" : "Aplikácia nie je zapnutá",
"Authentication error" : "Chyba autentifikácie",
@@ -66,7 +75,9 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
"Set an admin username." : "Zadajte používateľské meno administrátora.",
"Set an admin password." : "Zadajte heslo administrátora.",
+ "Can't create or write into the data directory %s" : "Nemožno vytvoriť alebo zapisovať do priečinka dát %s",
"%s shared »%s« with you" : "%s s vami zdieľa »%s«",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Zdieľanie %s zlyhalo, pretože backend nepodporuje typ zdieľania %i",
"Sharing %s failed, because the file does not exist" : "Zdieľanie %s zlyhalo, pretože súbor neexistuje",
"You are not allowed to share %s" : "Nemôžete zdieľať %s",
"Sharing %s failed, because the user %s is the item owner" : "Zdieľanie %s zlyhalo, pretože používateľ %s je vlastníkom položky",
@@ -77,6 +88,7 @@ OC.L10N.register(
"Sharing %s failed, because %s is not a member of the group %s" : "Zdieľanie %s zlyhalo, pretože %s nie je členom skupiny %s",
"You need to provide a password to create a public link, only protected links are allowed" : "Musíte zadať heslo ak chcete vytvoriť verejný odkaz, lebo iba odkazy chránené heslom sú povolené",
"Sharing %s failed, because sharing with links is not allowed" : "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Zdieľanie %s zlyhalo, nepodarilo sa nájsť %s, možno je server v súčasnej dobe nedostupný.",
"Share type %s is not valid for %s" : "Typ zdieľania %s nie je platný pre %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
"Setting permissions for %s failed, because the item was not found" : "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla",
@@ -95,11 +107,11 @@ OC.L10N.register(
"A valid username must be provided" : "Musíte zadať platné používateľské meno",
"A valid password must be provided" : "Musíte zadať platné heslo",
"The username is already being used" : "Meno používateľa je už použité",
- "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, or postgresql) nie sú nainštalované.",
- "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového adresára%s.",
+ "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, alebo postgresql) nie sú nainštalované.",
+ "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového priečinka%s.",
"Cannot write into \"config\" directory" : "Nie je možné zapisovať do priečinka \"config\"",
"Cannot write into \"apps\" directory" : "Nie je možné zapisovať do priečinka \"apps\"",
- "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do adresára aplikácií%s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
+ "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis do priečinka aplikácií %s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
"Cannot create \"data\" directory (%s)" : "Nie je možné vytvoriť priečinok \"data\" (%s)",
"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.",
"Setting locale to %s failed" : "Nastavenie locale na %s zlyhalo",
@@ -107,16 +119,20 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.",
"PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Prosím, požiadajte administrátora vášho servera o aktualizáciu PHP na najnovšiu verziu. Vaša verzia PHP už nie je podporovaná ownCloud-om a PHP komunitou.",
- "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sú uvedené ako chýbajúce?",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP je nakonfigurovaný tak, aby vytváralo raw post dáta. Od verzie 5.6 to nastavenie bude PHP vypisovať oznámenia aj pre dokonale platný kód.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Ak chcete tento problém vyriešiť, nastavte <code>always_populate_raw_post_data</code> na <code>-1</code> vo vašom php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky komentárov. To zneprístupní niekoľko základných aplikácií.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
+ "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sa tvária, že chýbajú?",
"Please ask your server administrator to restart the web server." : "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.",
"PostgreSQL >= 9 required" : "Vyžadované PostgreSQL >= 9",
"Please upgrade your database version" : "Prosím, aktualizujte verziu svojej databázy",
"Error occurred while checking PostgreSQL version" : "Nastala chyba pri overovaní verzie PostgreSQL",
"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Prosím, uistite sa, že máte PostgreSQL >= 9 alebo sa pozrite do protokolu, kde nájdete podrobnejšie informácie o chybe",
- "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento adresár nemohli ostatní používatelia vypísať.",
- "Data directory (%s) is readable by other users" : "Adresár dát (%s) je prístupný na čítanie ostatným používateľom",
- "Data directory (%s) is invalid" : "Adresár dát (%s) je neplatný",
- "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či adresár dát obsahuje súbor „.ocdata“.",
+ "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento priečinok nemohli ostatní používatelia otvoriť.",
+ "Data directory (%s) is readable by other users" : "Priečinok dát (%s) je prístupný na čítanie ostatným používateľom",
+ "Data directory (%s) is invalid" : "Priečinok dát (%s) je neplatný",
+ "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či priečinok dát obsahuje súbor \".ocdata\".",
"Could not obtain lock type %d on \"%s\"." : "Nepodarilo sa získať zámok typu %d na „%s“."
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index a844bd0b973..6d9768f569a 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -1,12 +1,20 @@
{ "translations": {
"Cannot write into \"config\" directory!" : "Nie je možné zapisovat do priečinka \"config\"!",
- "This can usually be fixed by giving the webserver write access to the config directory" : "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou.",
+ "This can usually be fixed by giving the webserver write access to the config directory" : "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis do priečinka s konfiguráciou.",
"See %s" : "Pozri %s",
- "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
+ "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
"Sample configuration detected" : "Detekovaná bola vzorová konfigurácia",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
"PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.",
"PHP with a version lower than %s is required." : "PHP je vyžadované vo vyššej verzii ako %s.",
+ "Following databases are supported: %s" : "Podporované sú tieto databázy: %s",
+ "The command line tool %s could not be found" : "Nástroj príkazového riadka %s nebol nájdený",
+ "The library %s is not available." : "Knižnica %s je nedostupná.",
+ "Library %s with a version higher than %s is required - available version %s." : "Požadovaná je knižnica %s vo vyššej verzii ako %s - dostupná verzia %s.",
+ "Library %s with a version lower than %s is required - available version %s." : "Požadovaná je knižnica %s v nižšej verzii ako %s - dostupná verzia %s.",
+ "Following platforms are supported: %s" : "Podporované sú nasledovné systémy: %s",
+ "ownCloud %s or higher is required." : "Požadovaná verzia ownCloudu %s alebo vyššia.",
+ "ownCloud with a version lower than %s is required." : "ownCloud je vyžadovaný v nižšej verzii ako %s.",
"Help" : "Pomoc",
"Personal" : "Osobné",
"Settings" : "Nastavenia",
@@ -14,6 +22,7 @@
"Admin" : "Administrátor",
"Recommended" : "Odporúčané",
"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.",
+ "App \\\"%s\\\" cannot be installed because the following dependencies are not fulfilled: %s" : "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti: %s",
"No app name specified" : "Nešpecifikované meno aplikácie",
"Unknown filetype" : "Neznámy typ súboru",
"Invalid image" : "Chybný obrázok",
@@ -27,7 +36,7 @@
"_%n hour ago_::_%n hours ago_" : ["pred %n hodinou","pred %n hodinami","pred %n hodinami"],
"_%n minute ago_::_%n minutes ago_" : ["pred %n minútou","pred %n minútami","pred %n minútami"],
"seconds ago" : "pred sekundami",
- "Database Error" : "Error databázy",
+ "Database Error" : "Chyba databázy",
"Please contact your system administrator." : "Prosím kontaktujte administrátora.",
"web services under your control" : "webové služby pod Vašou kontrolou",
"App directory already exists" : "Aplikačný priečinok už existuje",
@@ -40,7 +49,7 @@
"App does not provide an info.xml file" : "Aplikácia neposkytuje súbor info.xml",
"App can't be installed because of not allowed code in the App" : "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
- "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
+ "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje značku<shipped>true</shipped>, ktorá nie je povolená pre nedodávané aplikácie",
"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
"Application is not enabled" : "Aplikácia nie je zapnutá",
"Authentication error" : "Chyba autentifikácie",
@@ -64,7 +73,9 @@
"PostgreSQL username and/or password not valid" : "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
"Set an admin username." : "Zadajte používateľské meno administrátora.",
"Set an admin password." : "Zadajte heslo administrátora.",
+ "Can't create or write into the data directory %s" : "Nemožno vytvoriť alebo zapisovať do priečinka dát %s",
"%s shared »%s« with you" : "%s s vami zdieľa »%s«",
+ "Sharing %s failed, because the backend does not allow shares from type %i" : "Zdieľanie %s zlyhalo, pretože backend nepodporuje typ zdieľania %i",
"Sharing %s failed, because the file does not exist" : "Zdieľanie %s zlyhalo, pretože súbor neexistuje",
"You are not allowed to share %s" : "Nemôžete zdieľať %s",
"Sharing %s failed, because the user %s is the item owner" : "Zdieľanie %s zlyhalo, pretože používateľ %s je vlastníkom položky",
@@ -75,6 +86,7 @@
"Sharing %s failed, because %s is not a member of the group %s" : "Zdieľanie %s zlyhalo, pretože %s nie je členom skupiny %s",
"You need to provide a password to create a public link, only protected links are allowed" : "Musíte zadať heslo ak chcete vytvoriť verejný odkaz, lebo iba odkazy chránené heslom sú povolené",
"Sharing %s failed, because sharing with links is not allowed" : "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené",
+ "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Zdieľanie %s zlyhalo, nepodarilo sa nájsť %s, možno je server v súčasnej dobe nedostupný.",
"Share type %s is not valid for %s" : "Typ zdieľania %s nie je platný pre %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
"Setting permissions for %s failed, because the item was not found" : "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla",
@@ -93,11 +105,11 @@
"A valid username must be provided" : "Musíte zadať platné používateľské meno",
"A valid password must be provided" : "Musíte zadať platné heslo",
"The username is already being used" : "Meno používateľa je už použité",
- "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, or postgresql) nie sú nainštalované.",
- "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového adresára%s.",
+ "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, alebo postgresql) nie sú nainštalované.",
+ "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového priečinka%s.",
"Cannot write into \"config\" directory" : "Nie je možné zapisovať do priečinka \"config\"",
"Cannot write into \"apps\" directory" : "Nie je možné zapisovať do priečinka \"apps\"",
- "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do adresára aplikácií%s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
+ "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis do priečinka aplikácií %s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
"Cannot create \"data\" directory (%s)" : "Nie je možné vytvoriť priečinok \"data\" (%s)",
"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.",
"Setting locale to %s failed" : "Nastavenie locale na %s zlyhalo",
@@ -105,16 +117,20 @@
"Please ask your server administrator to install the module." : "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.",
"PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Prosím, požiadajte administrátora vášho servera o aktualizáciu PHP na najnovšiu verziu. Vaša verzia PHP už nie je podporovaná ownCloud-om a PHP komunitou.",
- "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sú uvedené ako chýbajúce?",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP je nakonfigurovaný tak, aby vytváralo raw post dáta. Od verzie 5.6 to nastavenie bude PHP vypisovať oznámenia aj pre dokonale platný kód.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Ak chcete tento problém vyriešiť, nastavte <code>always_populate_raw_post_data</code> na <code>-1</code> vo vašom php.ini",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky komentárov. To zneprístupní niekoľko základných aplikácií.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
+ "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sa tvária, že chýbajú?",
"Please ask your server administrator to restart the web server." : "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.",
"PostgreSQL >= 9 required" : "Vyžadované PostgreSQL >= 9",
"Please upgrade your database version" : "Prosím, aktualizujte verziu svojej databázy",
"Error occurred while checking PostgreSQL version" : "Nastala chyba pri overovaní verzie PostgreSQL",
"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Prosím, uistite sa, že máte PostgreSQL >= 9 alebo sa pozrite do protokolu, kde nájdete podrobnejšie informácie o chybe",
- "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento adresár nemohli ostatní používatelia vypísať.",
- "Data directory (%s) is readable by other users" : "Adresár dát (%s) je prístupný na čítanie ostatným používateľom",
- "Data directory (%s) is invalid" : "Adresár dát (%s) je neplatný",
- "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či adresár dát obsahuje súbor „.ocdata“.",
+ "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento priečinok nemohli ostatní používatelia otvoriť.",
+ "Data directory (%s) is readable by other users" : "Priečinok dát (%s) je prístupný na čítanie ostatným používateľom",
+ "Data directory (%s) is invalid" : "Priečinok dát (%s) je neplatný",
+ "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či priečinok dát obsahuje súbor \".ocdata\".",
"Could not obtain lock type %d on \"%s\"." : "Nepodarilo sa získať zámok typu %d na „%s“."
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
} \ No newline at end of file
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
index c4b5483e151..b4c471592b5 100644
--- a/lib/l10n/sv.js
+++ b/lib/l10n/sv.js
@@ -119,6 +119,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.",
"PHP module %s not installed." : "PHP modulen %s är inte installerad.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vänligen be serveradministratören uppdatera PHP till den senaste versionen. Din PHP-version stöds inte längre av ownCloud.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har installerats, men de listas fortfarande som saknade?",
"Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 krävs",
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
index ee6b12f09e2..c9af123467b 100644
--- a/lib/l10n/sv.json
+++ b/lib/l10n/sv.json
@@ -117,6 +117,8 @@
"Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.",
"PHP module %s not installed." : "PHP modulen %s är inte installerad.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vänligen be serveradministratören uppdatera PHP till den senaste versionen. Din PHP-version stöds inte längre av ownCloud.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har installerats, men de listas fortfarande som saknade?",
"Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 krävs",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index b0b2891847e..0819c2b40f6 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -119,6 +119,10 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "Lütfen modülün kurulması için sunucu yöneticinize danışın.",
"PHP module %s not installed." : "PHP modülü %s yüklü değil.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Lütfen PHP'yi en son sürüme güncellemesi için sunucu yönetinize danışın. PHP sürümünüz ownCloud ve PHP topluluğu tarafından artık desteklenmemektedir.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP, ham gönderi verisini yerleştirmek üzere ayarlanmış. PHP 5.6'dan itibaren tamamen geçerli kod olmasına rağmen PHP bilgi mesajları gösterecektir.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Bu hatayı düzeltmek için php.ini içerisindeki <code>always_populate_raw_post_data</code> ayarını <code>-1</code> olarak ayarlayın",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satıriçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek uygulamalarını erişilemez yapacak.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle meydana gelir.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?",
"Please ask your server administrator to restart the web server." : "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 gerekli",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index ad74acb2c8a..adbf8b1b94f 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -117,6 +117,10 @@
"Please ask your server administrator to install the module." : "Lütfen modülün kurulması için sunucu yöneticinize danışın.",
"PHP module %s not installed." : "PHP modülü %s yüklü değil.",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Lütfen PHP'yi en son sürüme güncellemesi için sunucu yönetinize danışın. PHP sürümünüz ownCloud ve PHP topluluğu tarafından artık desteklenmemektedir.",
+ "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP, ham gönderi verisini yerleştirmek üzere ayarlanmış. PHP 5.6'dan itibaren tamamen geçerli kod olmasına rağmen PHP bilgi mesajları gösterecektir.",
+ "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Bu hatayı düzeltmek için php.ini içerisindeki <code>always_populate_raw_post_data</code> ayarını <code>-1</code> olarak ayarlayın",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satıriçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek uygulamalarını erişilemez yapacak.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle meydana gelir.",
"PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?",
"Please ask your server administrator to restart the web server." : "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.",
"PostgreSQL >= 9 required" : "PostgreSQL >= 9 gerekli",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index aecbc8327db..b2cd33fed40 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -85,6 +85,8 @@ OC.L10N.register(
"Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
"Please ask your server administrator to install the module." : "Будь ласка, зверніться до адміністратора, щоб встановити модуль.",
"PHP module %s not installed." : "%s модуль PHP не встановлено.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.",
"Please ask your server administrator to restart the web server." : "Будь ласка, зверніться до адміністратора, щоб перезавантажити сервер."
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index 841e61216bc..1a9c42d7d4e 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -83,6 +83,8 @@
"Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
"Please ask your server administrator to install the module." : "Будь ласка, зверніться до адміністратора, щоб встановити модуль.",
"PHP module %s not installed." : "%s модуль PHP не встановлено.",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.",
"Please ask your server administrator to restart the web server." : "Будь ласка, зверніться до адміністратора, щоб перезавантажити сервер."
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index 874327fc7d9..75f97fc6879 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -91,6 +91,8 @@ OC.L10N.register(
"Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。",
"PHP module %s not installed." : "PHP %s 模块未安装。",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块,这将导致数个核心应用无法访问。",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的,例如 Zend OPcache 或 eAccelerator。",
"PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装,但仍然显示未安装?",
"Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。",
"PostgreSQL >= 9 required" : "要求 PostgreSQL >= 9",
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index d51c420d55c..46e10f91993 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -89,6 +89,8 @@
"Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。",
"PHP module %s not installed." : "PHP %s 模块未安装。",
"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块,这将导致数个核心应用无法访问。",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的,例如 Zend OPcache 或 eAccelerator。",
"PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装,但仍然显示未安装?",
"Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。",
"PostgreSQL >= 9 required" : "要求 PostgreSQL >= 9",
diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php
index d4b4ed6fb6a..00defd920d7 100644
--- a/lib/private/allconfig.php
+++ b/lib/private/allconfig.php
@@ -70,6 +70,16 @@ class AllConfig implements \OCP\IConfig {
}
/**
+ * Sets and deletes system wide values
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public function setSystemValues(array $configs) {
+ $this->systemConfig->setValues($configs);
+ }
+
+ /**
* Sets a new system wide value
*
* @param string $key the key of the value, under which will be saved
@@ -171,6 +181,7 @@ class AllConfig implements \OCP\IConfig {
'WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
$result = $this->connection->executeQuery($sql, array($userId, $appName, $key));
$oldValue = $result->fetchColumn();
+ $result->closeCursor();
$exists = $oldValue !== false;
if($oldValue === strval($value)) {
diff --git a/lib/private/app.php b/lib/private/app.php
index 3a1f731d621..60b644e58e2 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -321,6 +321,9 @@ class OC_App {
* @param string $app app
*/
public static function disable($app) {
+ if($app === 'files') {
+ throw new \Exception("files can't be disabled.");
+ }
self::$enabledAppsCache = array(); // flush
// check if app is a shipped app or not. if not delete
\OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app));
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index 6d9aa0bfe37..20a765e3434 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -131,8 +131,12 @@ class AppManager implements IAppManager {
* Disable an app for every user
*
* @param string $appId
+ * @throws \Exception if app can't be disabled
*/
public function disableApp($appId) {
+ if($appId === 'files') {
+ throw new \Exception("files can't be disabled.");
+ }
$this->appConfig->setValue($appId, 'enabled', 'no');
}
}
diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php
index 96d04ec2e42..be825e74ca3 100644
--- a/lib/private/app/platformrepository.php
+++ b/lib/private/app/platformrepository.php
@@ -28,13 +28,10 @@ class PlatformRepository {
$ext = new \ReflectionExtension($name);
try {
$prettyVersion = $ext->getVersion();
+ $prettyVersion = $this->normalizeVersion($prettyVersion);
} catch (\UnexpectedValueException $e) {
$prettyVersion = '0';
- }
- try {
$prettyVersion = $this->normalizeVersion($prettyVersion);
- } catch (\UnexpectedValueException $e) {
- continue;
}
$packages[$this->buildPackageName($name)] = $prettyVersion;
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 5858d992d56..4229b251e29 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -65,7 +65,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $this->getServer()->getAppConfig();
});
- $this->registerService('OCP\\IAppManager', function($c) {
+ $this->registerService('OCP\\App\\IAppManager', function($c) {
return $this->getServer()->getAppManager();
});
diff --git a/lib/private/config.php b/lib/private/config.php
index 8544de34b72..31e536221dd 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -41,10 +41,10 @@ class Config {
/**
* Lists all available config keys
- * @return array an array of key names
*
- * This function returns all keys saved in config.php. Please note that it
- * does not return the values.
+ * Please note that it does not return the values.
+ *
+ * @return array an array of key names
*/
public function getKeys() {
return array_keys($this->cache);
@@ -52,12 +52,12 @@ class Config {
/**
* Gets a value from config.php
+ *
+ * If it does not exist, $default will be returned.
+ *
* @param string $key key
* @param mixed $default = null default value
* @return mixed the value or $default
- *
- * This function gets the value from config.php. If it does not exist,
- * $default will be returned.
*/
public function getValue($key, $default = null) {
if (isset($this->cache[$key])) {
@@ -68,36 +68,81 @@ class Config {
}
/**
- * Sets a value
- * @param string $key key
- * @param mixed $value value
- *
- * This function sets the value and writes the config.php.
+ * Sets and deletes values and writes the config.php
*
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
*/
- public function setValue($key, $value) {
- // Add change
- $this->cache[$key] = $value;
+ public function setValues(array $configs) {
+ $needsUpdate = false;
+ foreach ($configs as $key => $value) {
+ if ($value !== null) {
+ $needsUpdate |= $this->set($key, $value);
+ } else {
+ $needsUpdate |= $this->delete($key);
+ }
+ }
- // Write changes
- $this->writeData();
+ if ($needsUpdate) {
+ // Write changes
+ $this->writeData();
+ }
}
/**
- * Removes a key from the config
- * @param string $key key
+ * Sets the value and writes it to config.php if required
*
- * This function removes a key from the config.php.
+ * @param string $key key
+ * @param mixed $value value
+ */
+ public function setValue($key, $value) {
+ if ($this->set($key, $value)) {
+ // Write changes
+ $this->writeData();
+ }
+ }
+
+ /**
+ * This function sets the value
*
+ * @param string $key key
+ * @param mixed $value value
+ * @return bool True if the file needs to be updated, false otherwise
+ */
+ protected function set($key, $value) {
+ if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
+ // Add change
+ $this->cache[$key] = $value;
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Removes a key from the config and removes it from config.php if required
+ * @param string $key
*/
public function deleteKey($key) {
+ if ($this->delete($key)) {
+ // Write changes
+ $this->writeData();
+ }
+ }
+
+ /**
+ * This function removes a key from the config
+ *
+ * @param string $key
+ * @return bool True if the file needs to be updated, false otherwise
+ */
+ protected function delete($key) {
if (isset($this->cache[$key])) {
// Delete key from cache
unset($this->cache[$key]);
-
- // Write changes
- $this->writeData();
+ return true;
}
+ return false;
}
/**
@@ -121,7 +166,9 @@ class Config {
// Include file and merge config
foreach ($configFiles as $file) {
$filePointer = @fopen($file, 'r');
- if($file === $this->configFilePath && $filePointer === false) {
+ if($file === $this->configFilePath &&
+ $filePointer === false &&
+ @!file_exists($this->configFilePath)) {
// Opening the main config might not be possible, e.g. if the wrong
// permissions are set (likely on a new installation)
continue;
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 0f5a3315f8f..e57d04f9a6e 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -64,7 +64,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
throw new \Sabre\DAV\Exception\ServiceUnavailable("Encryption is disabled");
}
- $fileName = basename($this->path);
+ $fileName = basename($this->info->getPath());
if (!\OCP\Util::isValidFileName($fileName)) {
throw new \Sabre\DAV\Exception\BadRequest();
}
@@ -74,8 +74,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
return $this->createFileChunked($data);
}
- list($storage, ) = $this->fileView->resolvePath($this->path);
- $needsPartFile = $this->needsPartFile($storage);
+ list($storage,) = $this->fileView->resolvePath($this->path);
+ $needsPartFile = $this->needsPartFile($storage) && (strlen($this->path) > 1);
if ($needsPartFile) {
// mark file as partial while uploading (ignored by the scanner)
@@ -220,6 +220,21 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
}
/**
+ * Returns the ETag for a file
+ *
+ * An ETag is a unique identifier representing the current version of the
+ * file. If the file changes, the ETag MUST change. The ETag is an
+ * arbitrary string, but MUST be surrounded by double-quotes.
+ *
+ * Return null if the ETag can not effectively be determined
+ *
+ * @return mixed
+ */
+ public function getETag() {
+ return '"' . $this->info->getEtag() . '"';
+ }
+
+ /**
* Returns the mime-type for a file
*
* If null is returned, we'll assume application/octet-stream
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index ff5a6cc8b4b..f6f0fac878b 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -123,10 +123,6 @@ class OC_Connector_Sabre_FilesPlugin extends \Sabre\DAV\ServerPlugin
if (!is_null($fileId)) {
$this->server->httpResponse->setHeader('OC-FileId', $fileId);
}
- $eTag = $node->getETag();
- if (!is_null($eTag)) {
- $this->server->httpResponse->setHeader('OC-ETag', $eTag);
- }
}
}
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index 3173ab8a30f..adc37849286 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -281,20 +281,4 @@ abstract class OC_Connector_Sabre_Node implements \Sabre\DAV\INode, \Sabre\DAV\I
}
return $p;
}
-
- /**
- * Returns the ETag for a file
- *
- * An ETag is a unique identifier representing the current version of the
- * file. If the file changes, the ETag MUST change. The ETag is an
- * arbitrary string, but MUST be surrounded by double-quotes.
- *
- * Return null if the ETag can not effectively be determined
- *
- * @return mixed
- */
- public function getETag() {
- return '"' . $this->info->getEtag() . '"';
- }
-
}
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index d2759d7a3ba..3422ed2d575 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -35,11 +35,11 @@ class ObjectTree extends \Sabre\DAV\ObjectTree {
}
/**
- * @param \Sabre\DAV\ICollection $rootNode
+ * @param \Sabre\DAV\INode $rootNode
* @param \OC\Files\View $view
* @param \OC\Files\Mount\Manager $mountManager
*/
- public function init(\Sabre\DAV\ICollection $rootNode, \OC\Files\View $view, \OC\Files\Mount\Manager $mountManager) {
+ public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OC\Files\Mount\Manager $mountManager) {
$this->rootNode = $rootNode;
$this->fileView = $view;
$this->mountManager = $mountManager;
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 8831320bcee..5438bdad5cb 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -596,6 +596,7 @@ class Cache {
'WHERE `parent` = ? AND `storage` = ?';
$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
if ($row = $result->fetchRow()) {
+ $result->closeCursor();
list($sum, $min, $unencryptedSum) = array_values($row);
$sum = 0 + $sum;
$min = 0 + $min;
@@ -618,6 +619,8 @@ class Cache {
if ($totalSize !== -1 and $unencryptedSum > 0) {
$totalSize = $unencryptedSum;
}
+ } else {
+ $result->closeCursor();
}
}
return $totalSize;
diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index 2b3967c8807..ad7f587b8b6 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -35,6 +35,7 @@ class HomeCache extends Cache {
'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
if ($row = $result->fetchRow()) {
+ $result->closeCursor();
list($sum, $unencryptedSum) = array_values($row);
$totalSize = 0 + $sum;
$unencryptedSize = 0 + $unencryptedSum;
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index f90b2738d03..e933782ce2f 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -175,14 +175,18 @@ class Filesystem {
* @param callable $wrapper
*/
public static function addStorageWrapper($wrapperName, $wrapper) {
- self::getLoader()->addStorageWrapper($wrapperName, $wrapper);
-
$mounts = self::getMountManager()->getAll();
- foreach ($mounts as $mount) {
- $mount->wrapStorage($wrapper);
+ if (!self::getLoader()->addStorageWrapper($wrapperName, $wrapper, $mounts)) {
+ // do not re-wrap if storage with this name already existed
+ return;
}
}
+ /**
+ * Returns the storage factory
+ *
+ * @return \OCP\Files\Storage\IStorageFactory
+ */
public static function getLoader() {
if (!self::$loader) {
self::$loader = new StorageFactory();
@@ -190,6 +194,11 @@ class Filesystem {
return self::$loader;
}
+ /**
+ * Returns the mount manager
+ *
+ * @return \OC\Files\Mount\Manager
+ */
public static function getMountManager() {
if (!self::$mounts) {
\OC_Util::setupFS();
@@ -284,7 +293,7 @@ class Filesystem {
}
$mount = self::$mounts->find($path);
if ($mount) {
- return array($mount->getStorage(), $mount->getInternalPath($path));
+ return array($mount->getStorage(), rtrim($mount->getInternalPath($path), '/'));
} else {
return array(null, null);
}
@@ -534,9 +543,11 @@ class Filesystem {
* @return bool
*/
static public function isFileBlacklisted($filename) {
+ $filename = self::normalizePath($filename);
+
$blacklist = \OC_Config::getValue('blacklisted_files', array('.htaccess'));
$filename = strtolower(basename($filename));
- return (in_array($filename, $blacklist));
+ return in_array($filename, $blacklist);
}
/**
@@ -725,6 +736,9 @@ class Filesystem {
return '/';
}
+ //normalize unicode if possible
+ $path = \OC_Util::normalizeUnicode($path);
+
//no windows style slashes
$path = str_replace('\\', '/', $path);
@@ -761,9 +775,6 @@ class Filesystem {
$path = substr($path, 0, -2);
}
- //normalize unicode if possible
- $path = \OC_Util::normalizeUnicode($path);
-
$normalizedPath = $windows_drive_letter . $path;
self::$normalizedPathCache[$cacheKey] = $normalizedPath;
diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php
index 5e78ef03dd0..86c23c62e4b 100644
--- a/lib/private/files/mapper.php
+++ b/lib/private/files/mapper.php
@@ -115,6 +115,8 @@ class Mapper
/**
* @param string $logicPath
+ * @return null
+ * @throws \OC\DatabaseException
*/
private function resolveLogicPath($logicPath) {
$logicPath = $this->resolveRelativePath($logicPath);
@@ -162,7 +164,8 @@ class Mapper
/**
* @param string $logicPath
- * @param boolean $store
+ * @param bool $store
+ * @return string
*/
private function create($logicPath, $store) {
$logicPath = $this->resolveRelativePath($logicPath);
@@ -191,7 +194,9 @@ class Mapper
}
/**
- * @param integer $index
+ * @param string $path
+ * @param int $index
+ * @return string
*/
public function slugifyPath($path, $index = null) {
$path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot);
@@ -205,7 +210,7 @@ class Mapper
continue;
}
- $sluggedElements[] = self::slugify($pathElement);
+ $sluggedElements[] = $this->slugify($pathElement);
}
// apply index to file name
@@ -253,13 +258,18 @@ class Mapper
// trim ending dots (for security reasons and win compatibility)
$text = preg_replace('~\.+$~', '', $text);
- if (empty($text)) {
+ if (empty($text) || \OC\Files\Filesystem::isFileBlacklisted($text)) {
/**
* Item slug would be empty. Previously we used uniqid() here.
* However this means that the behaviour is not reproducible, so
* when uploading files into a "empty" folder, the folders name is
* different.
*
+ * The other case is, that the slugified name would be a blacklisted
+ * filename. In this case we just use the same workaround by
+ * returning the secure md5 hash of the original name.
+ *
+ *
* If there would be a md5() hash collision, the deduplicate check
* will spot this and append an index later, so this should not be
* a problem.
diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php
index 77a51a17020..85edb7cb570 100644
--- a/lib/private/files/mount/mountpoint.php
+++ b/lib/private/files/mount/mountpoint.php
@@ -42,6 +42,14 @@ class MountPoint implements IMountPoint {
private $loader;
/**
+ * Specified whether the storage is invalid after failing to
+ * instantiate it.
+ *
+ * @var bool
+ */
+ private $invalidStorage = false;
+
+ /**
* @param string|\OC\Files\Storage\Storage $storage
* @param string $mountpoint
* @param array $arguments (optional) configuration for the storage backend
@@ -99,10 +107,15 @@ class MountPoint implements IMountPoint {
* @return \OC\Files\Storage\Storage
*/
private function createStorage() {
+ if ($this->invalidStorage) {
+ return null;
+ }
+
if (class_exists($this->class)) {
try {
return $this->loader->getInstance($this->mountPoint, $this->class, $this->arguments);
} catch (\Exception $exception) {
+ $this->invalidStorage = true;
if ($this->mountPoint === '/') {
// the root storage could not be initialized, show the user!
throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
@@ -113,6 +126,7 @@ class MountPoint implements IMountPoint {
}
} else {
\OC_Log::write('core', 'storage backend ' . $this->class . ' not found', \OC_Log::ERROR);
+ $this->invalidStorage = true;
return null;
}
}
@@ -137,6 +151,7 @@ class MountPoint implements IMountPoint {
if (is_null($storage)) {
return null;
}
+
$this->storage = $storage;
}
$this->storageId = $this->storage->getId();
@@ -177,7 +192,11 @@ class MountPoint implements IMountPoint {
* @param callable $wrapper
*/
public function wrapStorage($wrapper) {
- $this->storage = $wrapper($this->mountPoint, $this->getStorage());
+ $storage = $this->getStorage();
+ // storage can be null if it couldn't be initialized
+ if ($storage != null) {
+ $this->storage = $wrapper($this->mountPoint, $storage);
+ }
}
/**
diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index 17907a53044..536483fc89d 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -8,10 +8,9 @@
namespace OC\Files\Node;
-use OCP\Files\FileInfo;
use OCP\Files\NotPermittedException;
-class Node implements \OCP\Files\Node, FileInfo {
+class Node implements \OCP\Files\Node {
/**
* @var \OC\Files\View $view
*/
diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index 1dd4a3e378d..1834ef67bef 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -155,7 +155,7 @@ class Root extends Folder implements IRootFolder {
* @param string $path
* @throws \OCP\Files\NotFoundException
* @throws \OCP\Files\NotPermittedException
- * @return string
+ * @return \OCP\Files\Node
*/
public function get($path) {
$path = $this->normalizePath($path);
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 355148de37a..4f7b3ff8940 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -8,6 +8,7 @@
namespace OC\Files\Storage;
+use OCP\Files\StorageInvalidException;
use OCP\Files\StorageNotAvailableException;
use Sabre\DAV\Exception;
@@ -125,6 +126,9 @@ class DAV extends \OC\Files\Storage\Common {
return opendir('fakedir://' . $id);
} catch (Exception\NotFound $e) {
return false;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -144,6 +148,9 @@ class DAV extends \OC\Files\Storage\Common {
return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
} catch (Exception\NotFound $e) {
return false;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -159,6 +166,9 @@ class DAV extends \OC\Files\Storage\Common {
return true; //no 404 exception
} catch (Exception\NotFound $e) {
return false;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -275,6 +285,9 @@ class DAV extends \OC\Files\Storage\Common {
$this->client->proppatch($this->encodePath($path), array('{DAV:}lastmodified' => $mtime));
} catch (Exception\NotImplemented $e) {
return false;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -326,6 +339,9 @@ class DAV extends \OC\Files\Storage\Common {
$this->removeCachedFile($path1);
$this->removeCachedFile($path2);
return true;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -341,6 +357,9 @@ class DAV extends \OC\Files\Storage\Common {
$this->client->request('COPY', $path1, null, array('Destination' => $path2));
$this->removeCachedFile($path2);
return true;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -359,6 +378,9 @@ class DAV extends \OC\Files\Storage\Common {
);
} catch (Exception\NotFound $e) {
return array();
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -383,6 +405,11 @@ class DAV extends \OC\Files\Storage\Common {
} else {
return false;
}
+ } catch (Exception\NotFound $e) {
+ return false;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -423,6 +450,16 @@ class DAV extends \OC\Files\Storage\Common {
try {
$response = $this->client->request($method, $this->encodePath($path), $body);
return $response['statusCode'] == $expected;
+ } catch (Exception\NotFound $e) {
+ if ($method === 'DELETE') {
+ return false;
+ }
+
+ $this->convertSabreException($e);
+ return false;
+ } catch (\Sabre\DAV\Exception $e) {
+ $this->convertSabreException($e);
+ return false;
} catch (\Exception $e) {
// TODO: log for now, but in the future need to wrap/rethrow exception
\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -529,8 +566,32 @@ class DAV extends \OC\Files\Storage\Common {
} catch (Exception\NotFound $e) {
return false;
} catch (Exception $e) {
- throw new StorageNotAvailableException(get_class($e).": ".$e->getMessage());
+ $this->convertSabreException($e);
+ return false;
+ }
+ }
+
+ /**
+ * Convert sabre DAV exception to a storage exception,
+ * then throw it
+ *
+ * @param \Sabre\Dav\Exception $e sabre exception
+ * @throws StorageInvalidException if the storage is invalid, for example
+ * when the authentication expired or is invalid
+ * @throws StorageNotAvailableException if the storage is not available,
+ * which might be temporary
+ */
+ private function convertSabreException(\Sabre\Dav\Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ if ($e instanceof \Sabre\DAV\Exception\NotAuthenticated) {
+ // either password was changed or was invalid all along
+ throw new StorageInvalidException(get_class($e).': '.$e->getMessage());
+ } else if ($e instanceof \Sabre\DAV\Exception\MethodNotAllowed) {
+ // ignore exception, false will be returned
+ return;
}
+
+ throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
}
}
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index c9e8d422f9d..fa6dea2537c 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -21,11 +21,35 @@ class StorageFactory implements IStorageFactory {
*
* $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
*
- * @param string $wrapperName
- * @param callable $callback
+ * @param string $wrapperName name of the wrapper
+ * @param callable $callback callback
+ * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to
+ * @return bool true if the wrapper was added, false if there was already a wrapper with this
+ * name registered
*/
- public function addStorageWrapper($wrapperName, $callback) {
+ public function addStorageWrapper($wrapperName, $callback, $existingMounts = []) {
+ if (isset($this->storageWrappers[$wrapperName])) {
+ return false;
+ }
+
+ // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage
+ foreach ($existingMounts as $mount) {
+ $mount->wrapStorage($callback);
+ }
+
$this->storageWrappers[$wrapperName] = $callback;
+ return true;
+ }
+
+ /**
+ * Remove a storage wrapper by name.
+ * Note: internal method only to be used for cleanup
+ *
+ * @param string $wrapperName name of the wrapper
+ * @internal
+ */
+ public function removeStorageWrapper($wrapperName) {
+ unset($this->storageWrappers[$wrapperName]);
}
/**
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 76b7d34e756..3bc9fdff1ee 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -87,6 +87,11 @@ class View {
if ($this->fakeRoot == '') {
return $path;
}
+
+ if (rtrim($path,'/') === rtrim($this->fakeRoot, '/')) {
+ return '/';
+ }
+
if (strpos($path, $this->fakeRoot) !== 0) {
return null;
} else {
@@ -511,7 +516,7 @@ class View {
}
} else {
if ($this->is_dir($path1)) {
- $result = $this->copy($path1, $path2);
+ $result = $this->copy($path1, $path2, true);
if ($result === true) {
$result = $storage1->rmdir($internalPath1);
}
@@ -519,6 +524,7 @@ class View {
$source = $this->fopen($path1 . $postFix1, 'r');
$target = $this->fopen($path2 . $postFix2, 'w');
list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ $this->touch($path2, $this->filemtime($path1));
// close open handle - especially $source is necessary because unlink below will
// throw an exception on windows because the file is locked
@@ -526,7 +532,7 @@ class View {
fclose($target);
if ($result !== false) {
- $storage1->unlink($internalPath1);
+ $result &= $storage1->unlink($internalPath1);
}
}
}
@@ -536,16 +542,18 @@ class View {
if ($this->shouldEmitHooks()) {
$this->emit_file_hooks_post($exists, $path2);
}
- } elseif ($this->shouldEmitHooks() && $result !== false) {
+ } elseif ($result) {
$this->updater->rename($path1, $path2);
- \OC_Hook::emit(
- Filesystem::CLASSNAME,
- Filesystem::signal_post_rename,
- array(
- Filesystem::signal_param_oldpath => $this->getHookPath($path1),
- Filesystem::signal_param_newpath => $this->getHookPath($path2)
- )
- );
+ if ($this->shouldEmitHooks($path1) and $this->shouldEmitHooks($path2)) {
+ \OC_Hook::emit(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_post_rename,
+ array(
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2)
+ )
+ );
+ }
}
return $result;
} else {
@@ -556,7 +564,7 @@ class View {
}
}
- public function copy($path1, $path2) {
+ public function copy($path1, $path2, $preserveMtime = false) {
$postFix1 = (substr($path1, -1, 1) === '/') ? '/' : '';
$postFix2 = (substr($path2, -1, 1) === '/') ? '/' : '';
$absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
@@ -601,10 +609,13 @@ class View {
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$result = $this->mkdir($path2);
+ if ($preserveMtime) {
+ $this->touch($path2, $this->filemtime($path1));
+ }
if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
if (!Filesystem::isIgnoredDir($file)) {
- $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file, $preserveMtime);
}
}
}
@@ -612,6 +623,9 @@ class View {
$source = $this->fopen($path1 . $postFix1, 'r');
$target = $this->fopen($path2 . $postFix2, 'w');
list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ if($preserveMtime) {
+ $this->touch($path2, $this->filemtime($path1));
+ }
fclose($source);
fclose($target);
}
@@ -794,7 +808,7 @@ class View {
$result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
- if (in_array('delete', $hooks)) {
+ if (in_array('delete', $hooks) and $result) {
$this->updater->remove($path);
}
if (in_array('write', $hooks)) {
@@ -1037,7 +1051,22 @@ class View {
if ($subCache->getStatus('') === Cache\Cache::NOT_FOUND) {
$subScanner = $subStorage->getScanner('');
- $subScanner->scanFile('');
+ try {
+ $subScanner->scanFile('');
+ } catch (\OCP\Files\StorageNotAvailableException $e) {
+ continue;
+ } catch (\OCP\Files\StorageInvalidException $e) {
+ continue;
+ } catch (\Exception $e) {
+ // sometimes when the storage is not available it can be any exception
+ \OCP\Util::writeLog(
+ 'core',
+ 'Exception while scanning storage "' . $subStorage->getId() . '": ' .
+ get_class($e) . ': ' . $e->getMessage(),
+ \OCP\Util::ERROR
+ );
+ continue;
+ }
}
$rootEntry = $subCache->get('');
@@ -1293,7 +1322,7 @@ class View {
$maxLen = min(PHP_MAXPATHLEN, 4000);
// Check for the string length - performed using isset() instead of strlen()
// because isset() is about 5x-40x faster.
- if(isset($path[$maxLen])) {
+ if (isset($path[$maxLen])) {
$pathLen = strlen($path);
throw new \OCP\Files\InvalidPathException("Path length($pathLen) exceeds max path length($maxLen): $path");
}
@@ -1329,7 +1358,7 @@ class View {
* @return \OCP\Files\FileInfo
*/
private function getPartFileInfo($path) {
- $mount = $this->getMount($path);
+ $mount = $this->getMount($path);
$storage = $mount->getStorage();
$internalPath = $mount->getInternalPath($this->getAbsolutePath($path));
return new FileInfo(
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 60ed06ae352..4f4a498b739 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -556,7 +556,7 @@ class OC_Installer{
);
// is the code checker enabled?
- if(OC_Config::getValue('appcodechecker', true)) {
+ if(OC_Config::getValue('appcodechecker', false)) {
// check if grep is installed
$grep = \OC_Helper::findBinaryPath('grep');
if (!$grep) {
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index 7b711204256..64d01434b11 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -59,6 +59,16 @@ class OC_Config {
}
/**
+ * Sets and deletes values and writes the config.php
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public static function setValues(array $configs) {
+ self::$object->setValues($configs);
+ }
+
+ /**
* Removes a key from the config
* @param string $key key
*
diff --git a/lib/private/repair.php b/lib/private/repair.php
index d9fd99707e8..c74283896fd 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -13,6 +13,7 @@ use OC\Hooks\Emitter;
use OC\Repair\AssetCache;
use OC\Repair\CleanTags;
use OC\Repair\Collation;
+use OC\Repair\EnableFilesApp;
use OC\Repair\FillETags;
use OC\Repair\InnoDB;
use OC\Repair\RepairConfig;
@@ -84,6 +85,7 @@ class Repair extends BasicEmitter {
new AssetCache(),
new FillETags(\OC_DB::getConnection()),
new CleanTags(\OC_DB::getConnection()),
+ new EnableFilesApp(\OC::$server->getConfig()),
);
}
diff --git a/lib/private/search/result/file.php b/lib/private/search/result/file.php
index 13f1a62fbc0..ad65dce2bc4 100644
--- a/lib/private/search/result/file.php
+++ b/lib/private/search/result/file.php
@@ -77,7 +77,7 @@ class File extends \OCP\Search\Result {
$this->link = \OCP\Util::linkTo(
'files',
'index.php',
- array('dir' => $info['dirname'], 'file' => $info['basename'])
+ array('dir' => $info['dirname'], 'scrollto' => $info['basename'])
);
$this->permissions = $data->getPermissions();
$this->path = $path;
diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index 4a8ea170731..7bc83766365 100644
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -16,15 +16,22 @@ use OCP\ICertificateManager;
*/
class CertificateManager implements ICertificateManager {
/**
- * @var \OCP\IUser
+ * @var string
*/
- protected $user;
+ protected $uid;
/**
- * @param \OCP\IUser $user
+ * @var \OC\Files\View
*/
- public function __construct($user) {
- $this->user = $user;
+ protected $view;
+
+ /**
+ * @param string $uid
+ * @param \OC\Files\View $view relative zu data/
+ */
+ public function __construct($uid, \OC\Files\View $view) {
+ $this->uid = $uid;
+ $this->view = $view;
}
/**
@@ -34,18 +41,18 @@ class CertificateManager implements ICertificateManager {
*/
public function listCertificates() {
$path = $this->getPathToCertificates() . 'uploads/';
- if (!is_dir($path)) {
+ if (!$this->view->is_dir($path)) {
return array();
}
$result = array();
- $handle = opendir($path);
+ $handle = $this->view->opendir($path);
if (!is_resource($handle)) {
return array();
}
while (false !== ($file = readdir($handle))) {
if ($file != '.' && $file != '..') {
try {
- $result[] = new Certificate(file_get_contents($path . $file), $file);
+ $result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
} catch(\Exception $e) {}
}
}
@@ -60,10 +67,10 @@ class CertificateManager implements ICertificateManager {
$path = $this->getPathToCertificates();
$certs = $this->listCertificates();
- $fh_certs = fopen($path . '/rootcerts.crt', 'w');
+ $fh_certs = $this->view->fopen($path . '/rootcerts.crt', 'w');
foreach ($certs as $cert) {
$file = $path . '/uploads/' . $cert->getName();
- $data = file_get_contents($file);
+ $data = $this->view->file_get_contents($file);
if (strpos($data, 'BEGIN CERTIFICATE')) {
fwrite($fh_certs, $data);
fwrite($fh_certs, "\r\n");
@@ -87,17 +94,14 @@ class CertificateManager implements ICertificateManager {
}
$dir = $this->getPathToCertificates() . 'uploads/';
- if (!file_exists($dir)) {
- //path might not exist (e.g. non-standard OC_User::getHome() value)
- //in this case create full path using 3rd (recursive=true) parameter.
- //note that we use "normal" php filesystem functions here since the certs need to be local
- mkdir($dir, 0700, true);
+ if (!$this->view->file_exists($dir)) {
+ $this->view->mkdir($dir);
}
try {
$file = $dir . $name;
$certificateObject = new Certificate($certificate, $name);
- file_put_contents($file, $certificate);
+ $this->view->file_put_contents($file, $certificate);
$this->createCertificateBundle();
return $certificateObject;
} catch (\Exception $e) {
@@ -117,8 +121,8 @@ class CertificateManager implements ICertificateManager {
return false;
}
$path = $this->getPathToCertificates() . 'uploads/';
- if (file_exists($path . $name)) {
- unlink($path . $name);
+ if ($this->view->file_exists($path . $name)) {
+ $this->view->unlink($path . $name);
$this->createCertificateBundle();
}
return true;
@@ -134,7 +138,7 @@ class CertificateManager implements ICertificateManager {
}
private function getPathToCertificates() {
- $path = $this->user ? $this->user->getHome() . '/files_external/' : '/files_external/';
+ $path = is_null($this->uid) ? '/files_external/' : '/' . $this->uid . '/files_external/';
return $path;
}
diff --git a/lib/private/server.php b/lib/private/server.php
index c98f77c6479..15c33e1905f 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -249,7 +249,9 @@ class Server extends SimpleContainer implements IServerContainer {
});
$this->registerService('HTTPHelper', function (Server $c) {
$config = $c->getConfig();
- return new HTTPHelper($config, new \OC\Security\CertificateManager($c->getUserSession()->getUser()));
+ $user = $c->getUserSession()->getUser();
+ $uid = $user ? $user->getUID() : null;
+ return new HTTPHelper($config, new \OC\Security\CertificateManager($uid, new \OC\Files\View()));
});
$this->registerService('EventLogger', function (Server $c) {
if (defined('DEBUG') and DEBUG) {
@@ -631,18 +633,19 @@ class Server extends SimpleContainer implements IServerContainer {
/**
* Get the certificate manager for the user
*
- * @param \OCP\IUser $user (optional) if not specified the current loggedin user is used
+ * @param string $uid (optional) if not specified the current loggedin user is used
* @return \OCP\ICertificateManager
*/
- function getCertificateManager($user = null) {
- if (is_null($user)) {
+ function getCertificateManager($uid = null) {
+ if (is_null($uid)) {
$userSession = $this->getUserSession();
$user = $userSession->getUser();
if (is_null($user)) {
return null;
}
+ $uid = $user->getUID();
}
- return new CertificateManager($user);
+ return new CertificateManager($uid, new \OC\Files\View());
}
/**
diff --git a/lib/private/setup.php b/lib/private/setup.php
index b9ba8d906c2..e3a29b6469d 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -176,18 +176,19 @@ class OC_Setup {
//generate a random salt that is used to salt the local user passwords
$salt = \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(30);
- \OC::$server->getConfig()->setSystemValue('passwordsalt', $salt);
-
// generate a secret
$secret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(48);
- \OC::$server->getConfig()->setSystemValue('secret', $secret);
//write the config file
- \OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
- \OC::$server->getConfig()->setSystemValue('datadirectory', $dataDir);
- \OC::$server->getConfig()->setSystemValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
- \OC::$server->getConfig()->setSystemValue('dbtype', $dbType);
- \OC::$server->getConfig()->setSystemValue('version', implode('.', OC_Util::getVersion()));
+ \OC::$server->getConfig()->setSystemValues([
+ 'passwordsalt' => $salt,
+ 'secret' => $secret,
+ 'trusted_domains' => $trustedDomains,
+ 'datadirectory' => $dataDir,
+ 'overwrite.cli.url' => \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT,
+ 'dbtype' => $dbType,
+ 'version' => implode('.', OC_Util::getVersion()),
+ ]);
try {
$dbSetup->initialize($options);
@@ -272,7 +273,7 @@ class OC_Setup {
public static function updateHtaccess() {
$setupHelper = new OC_Setup(\OC::$server->getConfig());
if(!$setupHelper->isCurrentHtaccess()) {
- throw new \OC\HintException('.htaccess file has the wrong version. Please upload the correct version.');
+ throw new \OC\HintException('.htaccess file has the wrong version. Please upload the correct version. Maybe you forgot to replace it after updating?');
}
$content = "\n";
@@ -286,11 +287,11 @@ class OC_Setup {
$now = date('Y-m-d H:i:s');
$content = "# Generated by ownCloud on $now\n";
$content.= "# line below if for Apache 2.4\n";
- $content.= "<ifModule mod_authz_core>\n";
+ $content.= "<ifModule mod_authz_core.c>\n";
$content.= "Require all denied\n";
$content.= "</ifModule>\n\n";
$content.= "# line below if for Apache 2.2\n";
- $content.= "<ifModule !mod_authz_core>\n";
+ $content.= "<ifModule !mod_authz_core.c>\n";
$content.= "deny from all\n";
$content.= "</ifModule>\n\n";
$content.= "# section for Apache 2.2 and 2.4\n";
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 84625a217ee..08e295c3fff 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -35,20 +35,24 @@ abstract class AbstractDatabase {
}
public function initialize($config) {
- $dbuser = $config['dbuser'];
- $dbpass = $config['dbpass'];
- $dbname = $config['dbname'];
- $dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
- $dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
-
- \OC_Config::setValue('dbname', $dbname);
- \OC_Config::setValue('dbhost', $dbhost);
- \OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
- $this->dbuser = $dbuser;
- $this->dbpassword = $dbpass;
- $this->dbname = $dbname;
- $this->dbhost = $dbhost;
- $this->tableprefix = $dbtableprefix;
+ $dbUser = $config['dbuser'];
+ $dbPass = $config['dbpass'];
+ $dbName = $config['dbname'];
+ $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+ $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+
+ \OC_Config::setValues([
+ 'dbname' => $dbName,
+ 'dbhost' => $dbHost,
+ 'dbtableprefix' => $dbTablePrefix,
+ ]);
+
+ $this->dbuser = $dbUser;
+ $this->dbpassword = $dbPass;
+ $this->dbname = $dbName;
+ $this->dbhost = $dbHost;
+ $this->tableprefix = $dbTablePrefix;
}
+
+ abstract public function setupDatabase($userName);
}
diff --git a/lib/private/setup/mssql.php b/lib/private/setup/mssql.php
index 5143545b76f..1aa31a678a1 100644
--- a/lib/private/setup/mssql.php
+++ b/lib/private/setup/mssql.php
@@ -5,7 +5,7 @@ namespace OC\Setup;
class MSSQL extends AbstractDatabase {
public $dbprettyname = 'MS SQL Server';
- public function setupDatabase() {
+ public function setupDatabase($username) {
//check if the database user has admin right
$masterConnectionInfo = array( "Database" => "master", "UID" => $this->dbuser, "PWD" => $this->dbpassword);
@@ -21,8 +21,10 @@ class MSSQL extends AbstractDatabase {
$this->trans->t('You need to enter either an existing account or the administrator.'));
}
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbpassword' => $this->dbpassword,
+ ]);
$this->createDBLogin($masterConnection);
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 8f8d86d388c..97f75e2f676 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -51,8 +51,10 @@ class MySQL extends AbstractDatabase {
}
};
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbpassword' => $this->dbpassword,
+ ]);
}
//create the database
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index b75b658bae2..d4f71f18ab4 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -16,8 +16,11 @@ class OCI extends AbstractDatabase {
}
// allow empty hostname for oracle
$this->dbhost = $config['dbhost'];
- \OC_Config::setValue('dbhost', $this->dbhost);
- \OC_Config::setValue('dbtablespace', $this->dbtablespace);
+
+ \OC_Config::setValues([
+ 'dbhost' => $this->dbhost,
+ 'dbtablespace' => $this->dbtablespace,
+ ]);
}
public function validate($config) {
@@ -72,37 +75,32 @@ class OCI extends AbstractDatabase {
$result = oci_execute($stmt);
if($result) {
$row = oci_fetch_row($stmt);
- }
- if($result and $row[0] > 0) {
- //use the admin login data for the new database user
- //add prefix to the oracle user name to prevent collisions
- $this->dbuser='oc_'.$username;
- //create a new password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generateRandomBytes(30);
+ if ($row[0] > 0) {
+ //use the admin login data for the new database user
- //oracle passwords are treated as identifiers:
- // must start with alphanumeric char
- // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
- $this->dbpassword=substr($this->dbpassword, 0, 30);
+ //add prefix to the oracle user name to prevent collisions
+ $this->dbuser='oc_'.$username;
+ //create a new password so we don't need to store the admin config in the config file
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
- $this->createDBUser($connection);
+ //oracle passwords are treated as identifiers:
+ // must start with alphanumeric char
+ // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+ $this->dbpassword=substr($this->dbpassword, 0, 30);
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbname', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
-
- //create the database not necessary, oracle implies user = schema
- //$this->createDatabase($this->dbname, $this->dbuser, $connection);
- } else {
+ $this->createDBUser($connection);
+ }
+ }
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbname', $this->dbname);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbname' => $this->dbname,
+ 'dbpassword' => $this->dbpassword,
+ ]);
- //create the database not necessary, oracle implies user = schema
- //$this->createDatabase($this->dbname, $this->dbuser, $connection);
- }
+ //create the database not necessary, oracle implies user = schema
+ //$this->createDatabase($this->dbname, $this->dbuser, $connection);
//FIXME check tablespace exists: select * from user_tablespaces
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 3777d1620bc..5fb6b85fc89 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -43,20 +43,15 @@ class PostgreSQL extends AbstractDatabase {
$this->dbpassword=\OC_Util::generateRandomBytes(30);
$this->createDBUser($connection);
-
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
-
- //create the database
- $this->createDatabase($connection);
}
- else {
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
- //create the database
- $this->createDatabase($connection);
- }
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbpassword' => $this->dbpassword,
+ ]);
+
+ //create the database
+ $this->createDatabase($connection);
// the connection to dbname=postgres is not needed anymore
pg_close($connection);
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index c9f9654203e..bd21bdd4b3a 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -103,6 +103,7 @@ class Share extends \OC\Share\Constants {
$shares = $sharePaths = $fileTargets = array();
$publicShare = false;
+ $remoteShare = false;
$source = -1;
$cache = false;
@@ -170,18 +171,16 @@ class Share extends \OC\Share\Constants {
//check for public link shares
if (!$publicShare) {
- $query = \OC_DB::prepare(
- 'SELECT `share_with`
- FROM
- `*PREFIX*share`
- WHERE
- `item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
+ $query = \OC_DB::prepare('
+ SELECT `share_with`
+ FROM `*PREFIX*share`
+ WHERE `item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')', 1
);
$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
if (\OCP\DB::isError($result)) {
- \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+ \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
} else {
if ($result->fetchRow()) {
$publicShare = true;
@@ -189,6 +188,25 @@ class Share extends \OC\Share\Constants {
}
}
+ //check for remote share
+ if (!$remoteShare) {
+ $query = \OC_DB::prepare('
+ SELECT `share_with`
+ FROM `*PREFIX*share`
+ WHERE `item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')', 1
+ );
+
+ $result = $query->execute(array($source, self::SHARE_TYPE_REMOTE));
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if ($result->fetchRow()) {
+ $remoteShare = true;
+ }
+ }
+ }
+
// let's get the parent for the next round
$meta = $cache->get((int)$source);
if($meta !== false) {
@@ -234,7 +252,7 @@ class Share extends \OC\Share\Constants {
return $sharePaths;
}
- return array("users" => array_unique($shares), "public" => $publicShare);
+ return array('users' => array_unique($shares), 'public' => $publicShare, 'remote' => $remoteShare);
}
/**
@@ -706,6 +724,7 @@ class Share extends \OC\Share\Constants {
$token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(self::TOKEN_LENGTH, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_UPPER .
\OCP\Security\ISecureRandom::CHAR_DIGITS);
+ $shareWith = rtrim($shareWith, '/');
$shareId = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token, $itemSourceName);
$send = false;
@@ -2280,7 +2299,7 @@ class Share extends \OC\Share\Constants {
if ($user && $remote) {
$url = $remote . self::BASE_PATH_TO_SHARE_API . '?format=' . self::RESPONSE_FORMAT;
- $local = \OC::$server->getURLGenerator()->getAbsoluteURL('');
+ $local = \OC::$server->getURLGenerator()->getAbsoluteURL('/');
$fields = array(
'shareWith' => $user,
diff --git a/lib/private/systemconfig.php b/lib/private/systemconfig.php
index ce6883e5ab3..36cefdb8499 100644
--- a/lib/private/systemconfig.php
+++ b/lib/private/systemconfig.php
@@ -28,6 +28,16 @@ class SystemConfig {
}
/**
+ * Sets and deletes values and writes the config.php
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public function setValues(array $configs) {
+ \OC_Config::setValues($configs);
+ }
+
+ /**
* Looks up a system wide defined value
*
* @param string $key the key of the value, under which it was saved
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 44a8cd3a803..1a97eb26347 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -92,7 +92,9 @@ class OC_TemplateLayout extends OC_Template {
if(empty(self::$versionHash)) {
- self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
+ $v = OC_App::getAppVersions();
+ $v['core'] = implode('.', \OC_Util::getVersion());
+ self::$versionHash = md5(implode(',', $v));
}
$useAssetPipeline = self::isAssetPipelineEnabled();
@@ -214,7 +216,7 @@ class OC_TemplateLayout extends OC_Template {
}
/**
- * Converts the absolute filepath to a relative path from \OC::$SERVERROOT
+ * Converts the absolute file path to a relative path from \OC::$SERVERROOT
* @param string $filePath Absolute path
* @return string Relative path
* @throws Exception If $filePath is not under \OC::$SERVERROOT
diff --git a/lib/private/util.php b/lib/private/util.php
index c08cff81469..9a01ca3ac95 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -818,8 +818,7 @@ class OC_Util {
$parameters['user_autofocus'] = true;
}
if (isset($_REQUEST['redirect_url'])) {
- $redirectUrl = $_REQUEST['redirect_url'];
- $parameters['redirect_url'] = urlencode($redirectUrl);
+ $parameters['redirect_url'] = $_REQUEST['redirect_url'];
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
diff --git a/lib/public/files/node.php b/lib/public/files/node.php
index 35c20b487c9..c3434b4b609 100644
--- a/lib/public/files/node.php
+++ b/lib/public/files/node.php
@@ -29,7 +29,7 @@
// This means that they should be used by apps instead of the internal ownCloud classes
namespace OCP\Files;
-interface Node {
+interface Node extends FileInfo {
/**
* Move the file or folder to a new location
*
diff --git a/lib/public/files/storage/istoragefactory.php b/lib/public/files/storage/istoragefactory.php
index 769d7011de4..50c844af2e6 100644
--- a/lib/public/files/storage/istoragefactory.php
+++ b/lib/public/files/storage/istoragefactory.php
@@ -19,6 +19,8 @@ interface IStorageFactory {
*
* @param string $wrapperName
* @param callable $callback
+ * @return bool true if the wrapper was added, false if there was already a wrapper with this
+ * name registered
*/
public function addStorageWrapper($wrapperName, $callback);
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index a1952ef8f84..868a4133d2e 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -35,6 +35,14 @@ namespace OCP;
*/
interface IConfig {
/**
+ * Sets and deletes system wide values
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public function setSystemValues(array $configs);
+
+ /**
* Sets a new system wide value
*
* @param string $key the key of the value, under which will be saved
diff --git a/lib/repair/enablefilesapp.php b/lib/repair/enablefilesapp.php
new file mode 100644
index 00000000000..a3298cf76b3
--- /dev/null
+++ b/lib/repair/enablefilesapp.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright (c) 2015 Morris Jobke <hey@morrisjobke.de>
+ * 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;
+use OC\RepairStep;
+use OCP\IConfig;
+
+/**
+ * Class EnableFilesApp - enables files app if disabled
+ *
+ * TODO: remove this with ownCloud 8.1 - this isn't possible anymore with 8.0
+ *
+ * @package OC\Repair
+ */
+class EnableFilesApp extends BasicEmitter implements RepairStep {
+
+ /** @var IConfig */
+ protected $config;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
+ /**
+ * @return string
+ */
+ public function getName() {
+ return 'Re-enable file app';
+ }
+
+ /**
+ * Enables the files app if it is disabled
+ */
+ public function run() {
+ if ($this->config->getAppValue('files', 'enabled', 'no') !== 'yes') {
+ $this->config->setAppValue('files', 'enabled', 'yes');
+ $this->emit('\OC\Repair', 'info', ['Files app was disabled - re-enabled']);
+ }
+ }
+}
diff --git a/settings/application.php b/settings/application.php
index f7ba72f3bfc..6fe23447a72 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -1,7 +1,7 @@
<?php
/**
* @author Lukas Reschke
- * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ * @copyright 2014-2015 Lukas Reschke lukas@owncloud.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
@@ -16,6 +16,7 @@ use OC\Settings\Controller\LogSettingsController;
use OC\Settings\Controller\MailSettingsController;
use OC\Settings\Controller\SecuritySettingsController;
use OC\Settings\Controller\UsersController;
+use OC\Settings\Factory\SubAdminFactory;
use OC\Settings\Middleware\SubadminMiddleware;
use \OCP\AppFramework\App;
use OCP\IContainer;
@@ -90,7 +91,9 @@ class Application extends App {
$c->query('Defaults'),
$c->query('Mail'),
$c->query('DefaultMailAddress'),
- $c->query('URLGenerator')
+ $c->query('URLGenerator'),
+ $c->query('OCP\\App\\IAppManager'),
+ $c->query('SubAdminFactory')
);
});
$container->registerService('LogSettingsController', function(IContainer $c) {
@@ -144,6 +147,10 @@ class Application extends App {
$container->registerService('IsSubAdmin', function(IContainer $c) {
return \OC_Subadmin::isSubAdmin(\OC_User::getUser());
});
+ /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+ $container->registerService('SubAdminFactory', function(IContainer $c) {
+ return new SubAdminFactory();
+ });
$container->registerService('Mail', function(IContainer $c) {
return new \OC_Mail;
});
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
index 816b7b2e65c..72403437bb8 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -67,11 +67,13 @@ class AppSettingsController extends Controller {
$categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')];
// apps from external repo via OCS
$ocs = \OC_OCSClient::getCategories();
- foreach($ocs as $k => $v) {
- $categories[] = array(
- 'id' => $k,
- 'displayName' => str_replace('ownCloud ', '', $v)
- );
+ if ($ocs) {
+ foreach($ocs as $k => $v) {
+ $categories[] = array(
+ 'id' => $k,
+ 'displayName' => str_replace('ownCloud ', '', $v)
+ );
+ }
}
}
@@ -124,9 +126,11 @@ class AppSettingsController extends Controller {
default:
if ($category === 2) {
$apps = \OC_App::getAppstoreApps('approved');
- $apps = array_filter($apps, function ($app) {
- return isset($app['internalclass']) && $app['internalclass'] === 'recommendedapp';
- });
+ if ($apps) {
+ $apps = array_filter($apps, function ($app) {
+ return isset($app['internalclass']) && $app['internalclass'] === 'recommendedapp';
+ });
+ }
} else {
$apps = \OC_App::getAppstoreApps('approved', $category);
}
diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php
index d050a5ea03e..5874e644abb 100644
--- a/settings/controller/mailsettingscontroller.php
+++ b/settings/controller/mailsettingscontroller.php
@@ -84,20 +84,19 @@ class MailSettingsController extends Controller {
$mail_smtpport) {
$params = get_defined_vars();
+ $configs = [];
foreach($params as $key => $value) {
- if(empty($value)) {
- $this->config->deleteSystemValue($key);
- } else {
- $this->config->setSystemValue($key, $value);
- }
+ $configs[$key] = (empty($value)) ? null : $value;
}
// Delete passwords from config in case no auth is specified
- if($params['mail_smtpauth'] !== 1) {
- $this->config->deleteSystemValue('mail_smtpname');
- $this->config->deleteSystemValue('mail_smtppassword');
+ if ($params['mail_smtpauth'] !== 1) {
+ $configs['mail_smtpname'] = null;
+ $configs['mail_smtppassword'] = null;
}
+ $this->config->setSystemValues($configs);
+
return array('data' =>
array('message' =>
(string) $this->l10n->t('Saved')
@@ -113,8 +112,10 @@ class MailSettingsController extends Controller {
* @return array
*/
public function storeCredentials($mail_smtpname, $mail_smtppassword) {
- $this->config->setSystemValue('mail_smtpname', $mail_smtpname);
- $this->config->setSystemValue('mail_smtppassword', $mail_smtppassword);
+ $this->config->setSystemValues([
+ 'mail_smtpname' => $mail_smtpname,
+ 'mail_smtppassword' => $mail_smtppassword,
+ ]);
return array('data' =>
array('message' =>
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php
index 1be2f4db9b9..80fb81600df 100644
--- a/settings/controller/userscontroller.php
+++ b/settings/controller/userscontroller.php
@@ -1,7 +1,7 @@
<?php
/**
* @author Lukas Reschke
- * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ * @copyright 2014-2015 Lukas Reschke lukas@owncloud.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
@@ -11,9 +11,10 @@
namespace OC\Settings\Controller;
use OC\AppFramework\Http;
-use OC\User\Manager;
+use OC\Settings\Factory\SubAdminFactory;
use OC\User\User;
-use \OCP\AppFramework\Controller;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
@@ -52,6 +53,12 @@ class UsersController extends Controller {
private $fromMailAddress;
/** @var IURLGenerator */
private $urlGenerator;
+ /** @var bool contains the state of the encryption app */
+ private $isEncryptionAppEnabled;
+ /** @var bool contains the state of the admin recovery setting */
+ private $isRestoreEnabled = false;
+ /** @var SubAdminFactory */
+ private $subAdminFactory;
/**
* @param string $appName
@@ -66,6 +73,9 @@ class UsersController extends Controller {
* @param \OC_Defaults $defaults
* @param \OC_Mail $mail
* @param string $fromMailAddress
+ * @param IURLGenerator $urlGenerator
+ * @param IAppManager $appManager
+ * @param SubAdminFactory $subAdminFactory
*/
public function __construct($appName,
IRequest $request,
@@ -79,7 +89,9 @@ class UsersController extends Controller {
\OC_Defaults $defaults,
\OC_Mail $mail,
$fromMailAddress,
- IURLGenerator $urlGenerator) {
+ IURLGenerator $urlGenerator,
+ IAppManager $appManager,
+ SubAdminFactory $subAdminFactory) {
parent::__construct($appName, $request);
$this->userManager = $userManager;
$this->groupManager = $groupManager;
@@ -92,6 +104,15 @@ class UsersController extends Controller {
$this->mail = $mail;
$this->fromMailAddress = $fromMailAddress;
$this->urlGenerator = $urlGenerator;
+ $this->subAdminFactory = $subAdminFactory;
+
+ // check for encryption state - TODO see formatUserForIndex
+ $this->isEncryptionAppEnabled = $appManager->isEnabledForUser('files_encryption');
+ if($this->isEncryptionAppEnabled) {
+ // putting this directly in empty is possible in PHP 5.5+
+ $result = $config->getAppValue('files_encryption', 'recoveryAdminEnabled', 0);
+ $this->isRestoreEnabled = !empty($result);
+ }
}
/**
@@ -100,7 +121,33 @@ class UsersController extends Controller {
* @return array
*/
private function formatUserForIndex(IUser $user, array $userGroups = null) {
- return array(
+
+ // TODO: eliminate this encryption specific code below and somehow
+ // hook in additional user info from other apps
+
+ // recovery isn't possible if admin or user has it disabled and encryption
+ // is enabled - so we eliminate the else paths in the conditional tree
+ // below
+ $restorePossible = false;
+
+ if ($this->isEncryptionAppEnabled) {
+ if ($this->isRestoreEnabled) {
+ // check for the users recovery setting
+ $recoveryMode = $this->config->getUserValue($user->getUID(), 'files_encryption', 'recovery_enabled', '0');
+ // method call inside empty is possible with PHP 5.5+
+ $recoveryModeEnabled = !empty($recoveryMode);
+ if ($recoveryModeEnabled) {
+ // user also has recovery mode enabled
+ $restorePossible = true;
+ }
+ }
+ } else {
+ // recovery is possible if encryption is disabled (plain files are
+ // available)
+ $restorePossible = true;
+ }
+
+ return [
'name' => $user->getUID(),
'displayname' => $user->getDisplayName(),
'groups' => (empty($userGroups)) ? $this->groupManager->getUserGroupIds($user) : $userGroups,
@@ -109,8 +156,9 @@ class UsersController extends Controller {
'storageLocation' => $user->getHome(),
'lastLogin' => $user->getLastLogin(),
'backend' => $user->getBackendClassName(),
- 'email' => $this->config->getUserValue($user->getUID(), 'settings', 'email', '')
- );
+ 'email' => $this->config->getUserValue($user->getUID(), 'settings', 'email', ''),
+ 'isRestoreDisabled' => !$restorePossible,
+ ];
}
/**
@@ -120,7 +168,7 @@ class UsersController extends Controller {
private function getUsersForUID(array $userIDs) {
$users = [];
foreach ($userIDs as $uid => $displayName) {
- $users[] = $this->userManager->get($uid);
+ $users[$uid] = $this->userManager->get($uid);
}
return $users;
}
@@ -155,7 +203,7 @@ class UsersController extends Controller {
}
}
- $users = array();
+ $users = [];
if ($this->isAdmin) {
if($gid !== '') {
@@ -169,16 +217,34 @@ class UsersController extends Controller {
}
} else {
+ $subAdminOfGroups = $this->subAdminFactory->getSubAdminsOfGroups(
+ $this->userSession->getUser()->getUID()
+ );
// Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group
- if($gid !== '' && !in_array($gid, \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID()))) {
+ if($gid !== '' && !in_array($gid, $subAdminOfGroups)) {
$gid = '';
}
- $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
+ // Batch all groups the user is subadmin of when a group is specified
+ $batch = [];
+ if($gid === '') {
+ foreach($subAdminOfGroups as $group) {
+ $groupUsers = $this->groupManager->displayNamesInGroup($group, $pattern, $limit, $offset);
+ foreach($groupUsers as $uid => $displayName) {
+ $batch[$uid] = $displayName;
+ }
+ }
+ } else {
+ $batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset);
+ }
+ $batch = $this->getUsersForUID($batch);
+
foreach ($batch as $user) {
// Only add the groups, this user is a subadmin of
- $userGroups = array_intersect($this->groupManager->getUserGroupIds($user),
- \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID()));
+ $userGroups = array_values(array_intersect(
+ $this->groupManager->getUserGroupIds($user),
+ $subAdminOfGroups
+ ));
$users[] = $this->formatUserForIndex($user, $userGroups);
}
}
@@ -194,8 +260,6 @@ class UsersController extends Controller {
* @param array $groups
* @param string $email
* @return DataResponse
- *
- * TODO: Tidy up and write unit tests - code is mainly static method calls
*/
public function create($username, $password, array $groups=array(), $email='') {
@@ -208,17 +272,17 @@ class UsersController extends Controller {
);
}
- // TODO FIXME get rid of the static calls to OC_Subadmin
if (!$this->isAdmin) {
+ $userId = $this->userSession->getUser()->getUID();
if (!empty($groups)) {
foreach ($groups as $key => $group) {
- if (!\OC_SubAdmin::isGroupAccessible($this->userSession->getUser()->getUID(), $group)) {
+ if (!$this->subAdminFactory->isGroupAccessible($userId, $group)) {
unset($groups[$key]);
}
}
}
if (empty($groups)) {
- $groups = \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID());
+ $groups = $this->subAdminFactory->getSubAdminsOfGroups($userId);
}
}
@@ -235,7 +299,7 @@ class UsersController extends Controller {
if($user instanceof User) {
if($groups !== null) {
- foreach( $groups as $groupName ) {
+ foreach($groups as $groupName) {
$group = $this->groupManager->get($groupName);
if(empty($group)) {
@@ -301,11 +365,10 @@ class UsersController extends Controller {
*
* @param string $id
* @return DataResponse
- *
- * TODO: Tidy up and write unit tests - code is mainly static method calls
*/
public function destroy($id) {
- if($this->userSession->getUser()->getUID() === $id) {
+ $userId = $this->userSession->getUser()->getUID();
+ if($userId === $id) {
return new DataResponse(
array(
'status' => 'error',
@@ -317,8 +380,7 @@ class UsersController extends Controller {
);
}
- // FIXME: Remove this static function call at some point…
- if(!$this->isAdmin && !\OC_SubAdmin::isUserAccessible($this->userSession->getUser()->getUID(), $id)) {
+ if(!$this->isAdmin && !$this->subAdminFactory->isUserAccessible($userId, $id)) {
return new DataResponse(
array(
'status' => 'error',
@@ -365,14 +427,12 @@ class UsersController extends Controller {
* @param string $id
* @param string $mailAddress
* @return DataResponse
- *
- * TODO: Tidy up and write unit tests - code is mainly static method calls
*/
public function setMailAddress($id, $mailAddress) {
- // FIXME: Remove this static function call at some point…
- if($this->userSession->getUser()->getUID() !== $id
+ $userId = $this->userSession->getUser()->getUID();
+ if($userId !== $id
&& !$this->isAdmin
- && !\OC_SubAdmin::isUserAccessible($this->userSession->getUser()->getUID(), $id)) {
+ && !$this->subAdminFactory->isUserAccessible($userId, $id)) {
return new DataResponse(
array(
'status' => 'error',
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 55367e716c2..57edc18bd9a 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -132,7 +132,10 @@ input.userFilter {width: 200px;}
.ie8 table.hascontrols{border-collapse:collapse;width: 100%;}
.ie8 table.hascontrols tbody tr{border-collapse:collapse;border: 1px solid #ddd !important;}
-
+/* used to highlight a user row in red */
+#userlist tr.row-warning {
+ background-color: #FDD;
+}
/* APPS */
diff --git a/settings/factory/subadminfactory.php b/settings/factory/subadminfactory.php
new file mode 100644
index 00000000000..12a45527ae1
--- /dev/null
+++ b/settings/factory/subadminfactory.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2015 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Settings\Factory;
+
+/**
+ * @package OC\Settings\Factory
+ */
+class SubAdminFactory {
+ /**
+ * Get the groups $uid is SubAdmin of
+ * @param string $uid
+ * @return array Array of groups that $uid is subadmin of
+ */
+ function getSubAdminsOfGroups($uid) {
+ return \OC_SubAdmin::getSubAdminsGroups($uid);
+ }
+
+ /**
+ * Whether the $group is accessible to $uid as subadmin
+ * @param string $uid
+ * @param string $group
+ * @return bool
+ */
+ function isGroupAccessible($uid, $group) {
+ return \OC_SubAdmin::isGroupAccessible($uid, $group);
+ }
+
+ /**
+ * Whether $uid is accessible to $subAdmin
+ * @param string $subAdmin
+ * @param string $uid
+ * @return bool
+ */
+ function isUserAccessible($subAdmin, $uid) {
+ return \OC_SubAdmin::isUserAccessible($subAdmin, $uid);
+ }
+}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index d00d083407f..face18beef0 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,9 +3,9 @@ $(document).ready(function(){
// Hack to add a trusted domain
if (params.trustDomain) {
- OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?',
+ OC.dialogs.confirm(t('settings', 'Are you really sure you want add "{domain}" as trusted domain?',
{domain: params.trustDomain}),
- t('core', 'Add trusted domain'), function(answer) {
+ t('settings', 'Add trusted domain'), function(answer) {
if(answer) {
$.ajax({
type: 'POST',
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index f21c660b41f..7034972dd15 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -42,6 +42,7 @@ var UserList = {
* 'lastLogin': '1418632333'
* 'backend': 'LDAP',
* 'email': 'username@example.org'
+ * 'isRestoreDisabled':false
* }
* @param sort
* @returns table row created for this user
@@ -63,11 +64,12 @@ var UserList = {
}
/**
- * add username and displayname to row (in data and visible markup
+ * add username and displayname to row (in data and visible markup)
*/
$tr.data('uid', user.name);
$tr.data('displayname', user.displayname);
$tr.data('mailAddress', user.email);
+ $tr.data('restoreDisabled', user.isRestoreDisabled);
$tr.find('td.name').text(user.name);
$tr.find('td.displayName > span').text(user.displayname);
$tr.find('td.mailAddress > span').text(user.email);
@@ -352,6 +354,9 @@ var UserList = {
getMailAddress: function(element) {
return ($(element).closest('tr').data('mailAddress') || '').toString();
},
+ getRestoreDisabled: function(element) {
+ return ($(element).closest('tr').data('restoreDisabled') || '');
+ },
initDeleteHandling: function() {
//set up handler
UserDeleteHandler = new DeleteHandler('/settings/users/users', 'username',
@@ -417,7 +422,7 @@ var UserList = {
UserList.noMoreEntries = true;
$userList.siblings('.loading').remove();
}
- UserList.offset += loadedUsers;
+ UserList.offset += limit;
}).always(function() {
UserList.updating = false;
});
@@ -627,8 +632,16 @@ $(document).ready(function () {
event.stopPropagation();
var $td = $(this).closest('td');
+ var $tr = $(this).closest('tr');
var uid = UserList.getUID($td);
var $input = $('<input type="password">');
+ var isRestoreDisabled = UserList.getRestoreDisabled($td) === true;
+ if(isRestoreDisabled) {
+ $tr.addClass('row-warning');
+ // add tipsy if the password change could cause data loss - no recovery enabled
+ $input.tipsy({gravity:'s', fade:false});
+ $input.attr('title', t('settings', 'Changing the password will result in data loss, because data recovery is not available for this user'));
+ }
$td.find('img').hide();
$td.children('span').replaceWith($input);
$input
@@ -655,6 +668,8 @@ $(document).ready(function () {
.blur(function () {
$(this).replaceWith($('<span>●●●●●●●</span>'));
$td.find('img').show();
+ // remove highlight class from users without recovery ability
+ $tr.removeClass('row-warning');
});
});
$('input:password[id="recoveryPassword"]').keyup(function() {
@@ -851,6 +866,11 @@ $(document).ready(function () {
containerHeight = $('#app-content').height();
if(containerHeight > 40) {
initialUserCountLimit = Math.floor(containerHeight/40);
+ while((initialUserCountLimit % UserList.usersToLoad) !== 0) {
+ // must be a multiple of this, otherwise LDAP freaks out.
+ // FIXME: solve this in LDAP backend in 8.1
+ initialUserCountLimit = initialUserCountLimit + 1;
+ }
}
// trigger loading of users on startup
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index b60874fd1ea..e340544721c 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -99,7 +99,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
"Database Performance Info" : "Información de rindimientu de la base de datos",
- "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'" : "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
"Module 'fileinfo' missing" : "Nun s'atopó'l módulu \"fileinfo\"",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
"PHP charset is not set to UTF-8" : "El xuegu de caracteres de PHP nun ta afitáu pa UTF-8",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 359b1f33730..e7d0f52d37b 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -97,7 +97,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
"Database Performance Info" : "Información de rindimientu de la base de datos",
- "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'" : "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
"Module 'fileinfo' missing" : "Nun s'atopó'l módulu \"fileinfo\"",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
"PHP charset is not set to UTF-8" : "El xuegu de caracteres de PHP nun ta afitáu pa UTF-8",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 38c6d85836b..eed89a80c39 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -6,101 +6,115 @@ OC.L10N.register(
"Sharing" : "Споделяне",
"Security" : "Сигурност",
"Email Server" : "Имейл Сървър",
- "Log" : "Доклад",
+ "Log" : "Лог",
"Authentication error" : "Възникна проблем с идентификацията",
- "Your full name has been changed." : "Пълното ти име е променено.",
+ "Your full name has been changed." : "Вашето пълно име е променено.",
"Unable to change full name" : "Неуспешна промяна на пълното име.",
- "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" : "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
+ "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 permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове. Моля проверете своя owncloud.log или се свържете с админстратора.",
"Couldn't remove app." : "Неуспешно премахване на приложението.",
"Backups restored successfully" : "Резервното копие е успешно възстановено.",
- "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
+ "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" : "Админът не може да премахне себе си от админ групата.",
+ "Admins can't remove themself from the admin group" : "Администраторите не могат да премахват себе си от групата \"admin\".",
"Unable to add user to group %s" : "Неуспешно добавяне на потребител към групата %s.",
"Unable to remove user from group %s" : "Неуспешно премахване на потребител от групата %s.",
- "Couldn't update app." : "Неуспешно обновяване на приложението.",
+ "Couldn't update app." : "Обновяването на приложението е неуспешно..",
"Wrong password" : "Грешна парола",
"No user supplied" : "Липсва потребителско име",
- "Please provide an admin recovery password, otherwise all user data will be lost" : "Моля, посочете администраторската парола за възстановяване или всичката информация на потребителите ще бъде загубена.",
- "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
- "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
+ "Please provide an admin recovery password, otherwise all user data will be lost" : "Моля, посочете администраторската парола за възстановяване. В противен случай, всичката информация на потребителите ще бъде загубена.",
+ "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, проверете паролата и опитайте отново.",
+ "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но потребителския ключ за криптиране беше успешно обновен.",
"Unable to change password" : "Неуспешна смяна на паролата.",
"Enabled" : "Включено",
"Not enabled" : "Изключено",
"Recommended" : "Препоръчано",
- "Saved" : "Запис",
- "test email settings" : "провери имейл настройките",
- "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
- "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
+ "Group already exists." : "Групата вече съществува.",
+ "Unable to add group." : "Неуспешно добавяне на група.",
+ "Unable to delete group." : "Неуспешно изтриване на група",
+ "log-level out of allowed range" : "Ниво на проследяване \\(log-level\\) e извън допустимия обхват",
+ "Saved" : "Запаметяване",
+ "test email settings" : "проверка на настройките на електронна поща",
+ "If you received this email, the settings seem to be correct." : "Ако сте получили този имейл, изглежда, че настройките са ви правилни.",
+ "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на електронната поща. Моля, проверете вашите настройки.",
"Email sent" : "Имейлът е изпратен",
- "You need to set your user email before being able to send test emails." : "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
- "Email saved" : "Имейла запазен",
- "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
- "Add trusted domain" : "Добави сигурен домейн",
+ "You need to set your user email before being able to send test emails." : "Трябва да зададете своя имейл преди да можете да изпращате тестови имейли.",
+ "Invalid mail address" : "невалиден адрес на електронна поща",
+ "Unable to create user." : "Неуспешно създаване на потребител.",
+ "Your %s account was created" : "Вашия %s профил бе създаден",
+ "Unable to delete user." : "Неуспешно изтриване на потребител.",
+ "Forbidden" : "Забранено",
+ "Invalid user" : "Невалиден протребител",
+ "Unable to change mail address" : "Неуспешна промяна на адрес на електронна поща",
+ "Email saved" : "Имейлът е запазен",
+ "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен/на ли сте, че искате \"{domain}\" да бъде добавен като сигурен домейн?",
+ "Add trusted domain" : "Добавяне на сигурен домейн",
"Sending..." : "Изпращане...",
"All" : "Всички",
- "Please wait...." : "Моля изчакайте....",
+ "Please wait...." : "Моля, изчакайте....",
"Error while disabling app" : "Грешка при изключването на приложението",
- "Disable" : "Изключено",
- "Enable" : "Включено",
+ "Disable" : "Изключване",
+ "Enable" : "Включване",
"Error while enabling app" : "Грешка при включване на приложението",
- "Updating...." : "Обновява се...",
+ "Updating...." : "Обновяване...",
"Error while updating app" : "Грешка при обновяване на приложението.",
"Updated" : "Обновено",
"Uninstalling ...." : "Премахване ...",
- "Error while uninstalling app" : "Грешка при премахването на приложението.",
+ "Error while uninstalling app" : "Грешка при премахването на приложението",
"Uninstall" : "Премахване",
- "Select a profile picture" : "Избери аватар",
+ "Select a profile picture" : "Избиране на профилна снимка",
"Very weak password" : "Много слаба парола",
"Weak password" : "Слаба парола",
"So-so password" : "Не особено добра парола",
"Good password" : "Добра парола",
"Strong password" : "Сигурна парола",
- "Valid until {date}" : "Валиден до {date}",
- "Delete" : "Изтрий",
- "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
- "Delete encryption keys permanently." : "Изтрий криптиращите ключове безвъзвратно.",
- "Restore encryption keys." : "Възстанови криптиращите ключове.",
+ "Valid until {date}" : "Далидна до {date}",
+ "Delete" : "Изтриване",
+ "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакайте. Това може да отнеме известно време...",
+ "Delete encryption keys permanently." : "Изтриване на криптиращите ключове безвъзвратно.",
+ "Restore encryption keys." : "Възстановяване на криптиращите ключове.",
"Groups" : "Групи",
"Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
- "Error creating group" : "Грешка при създаване на група.",
+ "Error creating group" : "Грешка при създаване на група",
"A valid group name must be provided" : "Очаква се валидно име на група",
- "deleted {groupName}" : "{groupName} изтрит",
- "undo" : "възтановяване",
+ "deleted {groupName}" : "{groupName} е изтрита",
+ "undo" : "възстановяване",
"no group" : "няма група",
"never" : "никога",
- "deleted {userName}" : "{userName} изтрит",
- "add group" : "нова група",
- "A valid username must be provided" : "Валидно потребителско име трябва да бъде зададено.",
- "Error creating user" : "Грешка при създаване на потребител.",
- "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
- "__language_name__" : "__language_name__",
- "Personal Info" : "Лична Информация",
+ "deleted {userName}" : "{userName} е изтрит",
+ "add group" : "добавяне на група",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Промяна на паролата ще доведе до загуба на данни, защото не е налично възстановяване за този потребител.",
+ "A valid username must be provided" : "Трябва да бъде зададено валидно потребителско име",
+ "Error creating user" : "Грешка при създаване на потребител",
+ "A valid password must be provided" : "Трябва да бъде зададена валидна парола",
+ "A valid email must be provided" : "Трябва да бъде зададена валидна електронна поща",
+ "__language_name__" : "Български",
+ "Personal Info" : "Лична информация",
"SSL root certificates" : "SSL root сертификати",
"Encryption" : "Криптиране",
"Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
- "Info, warnings, errors and fatal issues" : "Информация, предупреждения, грешки и фатални проблеми",
+ "Info, warnings, errors and fatal issues" : "информация, предупреждения, грешки и фатални проблеми",
"Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми",
"Errors and fatal issues" : "Грешки и фатални проблеми",
"Fatal issues only" : "Само фатални проблеми",
"None" : "Няма",
"Login" : "Вход",
- "Plain" : "Не защитен",
+ "Plain" : "Обикновен",
"NT LAN Manager" : "NT LAN Manager",
"SSL" : "SSL",
"TLS" : "TLS",
"Security Warning" : "Предупреждение за Сигурноста",
- "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "В момента използваш HTTP, за да посетиш %s. Силно препоръчваме да настроиш съвръра си да използва HTTPS.",
- "Setup Warning" : "Предупреждение за Настройките",
- "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
- "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или 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. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
+ "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "В момента достъпвате %s през HTTP. Силно Ви препоръчваме да настроите съвръра си да изисква HTTPS.",
+ "Setup Warning" : "Предупреждение за настройките",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това ще направи няколко основни приложения недостъпни.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на кеш/акселератор като Zend OPache или eAccelerator.",
+ "Database Performance Info" : "Информация за прозиводителността на базата данни",
+ "Microsoft Windows Platform" : "Платформа Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Вашия сървър работи на Microsoft Windows. Ние горещо препоръчваме Linux за оптимално потребителско изживяване.",
"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 откриването.",
"PHP charset is not set to UTF-8" : "PHP таблицата от символи не е настроена за UTF-8",
@@ -108,7 +122,10 @@ OC.L10N.register(
"Locale not working" : "Местоположението не работи",
"System locale can not be set to a one which supports UTF-8." : "Системните настройки за местоположение не могат да бъдат промени на такива, подържащи UTF-8.",
"This means that there might be problems with certain characters in file names." : "Това означва, че може да има проблеми с определини символи в имената на файловете.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме инсталиране на необходимите паките на системата, за поддръжка на следните местоположения: %s.",
"URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не е в основата на вашия домейн и използва системния cron, могат да възникнат проблеми с генерирането на URLи. За избягване на тези проблеми, моля настройте <code>overwrite.cli.url</code> опцията в config.php файла с мрежовия път към вашята инсталация (Вероятно : \\\"%s\\\")",
+ "Configuration Checks" : "Проверки на конфигурацията",
"No problems found" : "Не са открити проблеми",
"Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
"Last cron was executed at %s." : "Последният cron се изпълни в %s.",
@@ -128,6 +145,7 @@ OC.L10N.register(
"Enforce expiration date" : "Изисквай дата на изтичане",
"Allow resharing" : "Разреши пресподеляне.",
"Restrict users to only share with users in their groups" : "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
+ "Allow users to send mail notification for shared files to other users" : "Разреши потребителите да изпращат уведомителни писма за споделени файлове към други потребители.",
"Exclude groups from sharing" : "Забрани групи да споделят",
"These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
"Enforce HTTPS" : "Изисквай HTTPS",
@@ -150,8 +168,10 @@ OC.L10N.register(
"Test email settings" : "Настройки на проверяващия имейл",
"Send email" : "Изпрати имейл",
"Log level" : "Детайли на доклада",
+ "Download logfile" : "Изтегли log файла",
"More" : "Още",
"Less" : "По-малко",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log файла е по-голям от 100MB. Изтеглянето му може да отнеме време!",
"Version" : "Версия",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Още приложения",
@@ -161,16 +181,22 @@ OC.L10N.register(
"Documentation:" : "Документация:",
"User Documentation" : "Потребителска Документация",
"Admin Documentation" : "Админ Документация",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Това приложение не може да бъде инсталирано, защото следните зависимости не са удовлетворени:",
"Update to %s" : "Обнови до %s",
"Enable only for specific groups" : "Включи само за определени групи",
"Uninstall App" : "Премахни Приложението",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здрасти,<br><br>Само да ти кажа, че имаш %s профил<br><br> Потребителя ти е: %s<br>Достъпи го: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Поздрави!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здрасти,\n\nСамо да ти кажа, че имаш %s профил.\n\nПотребителя ти е: %s\nДостъпи го: %s\n",
"Administrator Documentation" : "Административна Документация",
"Online Documentation" : "Документация в Интернет",
"Forum" : "Форум",
"Bugtracker" : "Докладвани грешки",
"Commercial Support" : "Платена Поддръжка",
"Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
+ "Desktop client" : "Клиент за настолен компютър",
+ "Android app" : "Андроид приложение",
+ "iOS app" : "iOS приложение",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
"Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.",
@@ -181,9 +207,11 @@ OC.L10N.register(
"New password" : "Нова парола",
"Change password" : "Промяна на паролата",
"Full Name" : "Пълно Име",
+ "No display name set" : "Няма настроено екранно име",
"Email" : "Имейл",
"Your email address" : "Твоят имейл адрес",
"Fill in an email address to enable password recovery and receive notifications" : "Въведи имейл, за да включиш функцията за възстановяване на паролата и уведомления.",
+ "No email address set" : "Няма настроен адрес на електронна поща",
"Profile picture" : "Аватар",
"Upload new" : "Качи нов",
"Select new from Files" : "Избери нов от Файловете",
@@ -207,10 +235,14 @@ OC.L10N.register(
"Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
"Show storage location" : "Покажи място за запис",
"Show last log in" : "Покажи последно вписване",
+ "Send email to new user" : "Изпращай писмо към нов потребител",
+ "Show email address" : "Покажи адреса на електронната поща",
"Username" : "Потребителско Име",
+ "E-Mail" : "Електронна поща",
"Create" : "Създаване",
"Admin Recovery Password" : "Възстановяване на Администраторска Парола",
"Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
+ "Search Users" : "Търси Потребители",
"Add Group" : "Добави Група",
"Group" : "Група",
"Everyone" : "Всички",
@@ -225,6 +257,7 @@ OC.L10N.register(
"Last Login" : "Последно Вписване",
"change full name" : "промени пълното име",
"set new password" : "сложи нова парола",
+ "change email address" : "Смени адреса на елетронната поща",
"Default" : "По подразбиране"
},
"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 39243c38f62..a15a95026af 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -4,101 +4,115 @@
"Sharing" : "Споделяне",
"Security" : "Сигурност",
"Email Server" : "Имейл Сървър",
- "Log" : "Доклад",
+ "Log" : "Лог",
"Authentication error" : "Възникна проблем с идентификацията",
- "Your full name has been changed." : "Пълното ти име е променено.",
+ "Your full name has been changed." : "Вашето пълно име е променено.",
"Unable to change full name" : "Неуспешна промяна на пълното име.",
- "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" : "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
+ "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 permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове. Моля проверете своя owncloud.log или се свържете с админстратора.",
"Couldn't remove app." : "Неуспешно премахване на приложението.",
"Backups restored successfully" : "Резервното копие е успешно възстановено.",
- "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
+ "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" : "Админът не може да премахне себе си от админ групата.",
+ "Admins can't remove themself from the admin group" : "Администраторите не могат да премахват себе си от групата \"admin\".",
"Unable to add user to group %s" : "Неуспешно добавяне на потребител към групата %s.",
"Unable to remove user from group %s" : "Неуспешно премахване на потребител от групата %s.",
- "Couldn't update app." : "Неуспешно обновяване на приложението.",
+ "Couldn't update app." : "Обновяването на приложението е неуспешно..",
"Wrong password" : "Грешна парола",
"No user supplied" : "Липсва потребителско име",
- "Please provide an admin recovery password, otherwise all user data will be lost" : "Моля, посочете администраторската парола за възстановяване или всичката информация на потребителите ще бъде загубена.",
- "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
- "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
+ "Please provide an admin recovery password, otherwise all user data will be lost" : "Моля, посочете администраторската парола за възстановяване. В противен случай, всичката информация на потребителите ще бъде загубена.",
+ "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, проверете паролата и опитайте отново.",
+ "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но потребителския ключ за криптиране беше успешно обновен.",
"Unable to change password" : "Неуспешна смяна на паролата.",
"Enabled" : "Включено",
"Not enabled" : "Изключено",
"Recommended" : "Препоръчано",
- "Saved" : "Запис",
- "test email settings" : "провери имейл настройките",
- "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
- "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
+ "Group already exists." : "Групата вече съществува.",
+ "Unable to add group." : "Неуспешно добавяне на група.",
+ "Unable to delete group." : "Неуспешно изтриване на група",
+ "log-level out of allowed range" : "Ниво на проследяване \\(log-level\\) e извън допустимия обхват",
+ "Saved" : "Запаметяване",
+ "test email settings" : "проверка на настройките на електронна поща",
+ "If you received this email, the settings seem to be correct." : "Ако сте получили този имейл, изглежда, че настройките са ви правилни.",
+ "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на електронната поща. Моля, проверете вашите настройки.",
"Email sent" : "Имейлът е изпратен",
- "You need to set your user email before being able to send test emails." : "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
- "Email saved" : "Имейла запазен",
- "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
- "Add trusted domain" : "Добави сигурен домейн",
+ "You need to set your user email before being able to send test emails." : "Трябва да зададете своя имейл преди да можете да изпращате тестови имейли.",
+ "Invalid mail address" : "невалиден адрес на електронна поща",
+ "Unable to create user." : "Неуспешно създаване на потребител.",
+ "Your %s account was created" : "Вашия %s профил бе създаден",
+ "Unable to delete user." : "Неуспешно изтриване на потребител.",
+ "Forbidden" : "Забранено",
+ "Invalid user" : "Невалиден протребител",
+ "Unable to change mail address" : "Неуспешна промяна на адрес на електронна поща",
+ "Email saved" : "Имейлът е запазен",
+ "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен/на ли сте, че искате \"{domain}\" да бъде добавен като сигурен домейн?",
+ "Add trusted domain" : "Добавяне на сигурен домейн",
"Sending..." : "Изпращане...",
"All" : "Всички",
- "Please wait...." : "Моля изчакайте....",
+ "Please wait...." : "Моля, изчакайте....",
"Error while disabling app" : "Грешка при изключването на приложението",
- "Disable" : "Изключено",
- "Enable" : "Включено",
+ "Disable" : "Изключване",
+ "Enable" : "Включване",
"Error while enabling app" : "Грешка при включване на приложението",
- "Updating...." : "Обновява се...",
+ "Updating...." : "Обновяване...",
"Error while updating app" : "Грешка при обновяване на приложението.",
"Updated" : "Обновено",
"Uninstalling ...." : "Премахване ...",
- "Error while uninstalling app" : "Грешка при премахването на приложението.",
+ "Error while uninstalling app" : "Грешка при премахването на приложението",
"Uninstall" : "Премахване",
- "Select a profile picture" : "Избери аватар",
+ "Select a profile picture" : "Избиране на профилна снимка",
"Very weak password" : "Много слаба парола",
"Weak password" : "Слаба парола",
"So-so password" : "Не особено добра парола",
"Good password" : "Добра парола",
"Strong password" : "Сигурна парола",
- "Valid until {date}" : "Валиден до {date}",
- "Delete" : "Изтрий",
- "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
- "Delete encryption keys permanently." : "Изтрий криптиращите ключове безвъзвратно.",
- "Restore encryption keys." : "Възстанови криптиращите ключове.",
+ "Valid until {date}" : "Далидна до {date}",
+ "Delete" : "Изтриване",
+ "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакайте. Това може да отнеме известно време...",
+ "Delete encryption keys permanently." : "Изтриване на криптиращите ключове безвъзвратно.",
+ "Restore encryption keys." : "Възстановяване на криптиращите ключове.",
"Groups" : "Групи",
"Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
- "Error creating group" : "Грешка при създаване на група.",
+ "Error creating group" : "Грешка при създаване на група",
"A valid group name must be provided" : "Очаква се валидно име на група",
- "deleted {groupName}" : "{groupName} изтрит",
- "undo" : "възтановяване",
+ "deleted {groupName}" : "{groupName} е изтрита",
+ "undo" : "възстановяване",
"no group" : "няма група",
"never" : "никога",
- "deleted {userName}" : "{userName} изтрит",
- "add group" : "нова група",
- "A valid username must be provided" : "Валидно потребителско име трябва да бъде зададено.",
- "Error creating user" : "Грешка при създаване на потребител.",
- "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
- "__language_name__" : "__language_name__",
- "Personal Info" : "Лична Информация",
+ "deleted {userName}" : "{userName} е изтрит",
+ "add group" : "добавяне на група",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Промяна на паролата ще доведе до загуба на данни, защото не е налично възстановяване за този потребител.",
+ "A valid username must be provided" : "Трябва да бъде зададено валидно потребителско име",
+ "Error creating user" : "Грешка при създаване на потребител",
+ "A valid password must be provided" : "Трябва да бъде зададена валидна парола",
+ "A valid email must be provided" : "Трябва да бъде зададена валидна електронна поща",
+ "__language_name__" : "Български",
+ "Personal Info" : "Лична информация",
"SSL root certificates" : "SSL root сертификати",
"Encryption" : "Криптиране",
"Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
- "Info, warnings, errors and fatal issues" : "Информация, предупреждения, грешки и фатални проблеми",
+ "Info, warnings, errors and fatal issues" : "информация, предупреждения, грешки и фатални проблеми",
"Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми",
"Errors and fatal issues" : "Грешки и фатални проблеми",
"Fatal issues only" : "Само фатални проблеми",
"None" : "Няма",
"Login" : "Вход",
- "Plain" : "Не защитен",
+ "Plain" : "Обикновен",
"NT LAN Manager" : "NT LAN Manager",
"SSL" : "SSL",
"TLS" : "TLS",
"Security Warning" : "Предупреждение за Сигурноста",
- "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "В момента използваш HTTP, за да посетиш %s. Силно препоръчваме да настроиш съвръра си да използва HTTPS.",
- "Setup Warning" : "Предупреждение за Настройките",
- "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.",
- "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или 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. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
+ "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "В момента достъпвате %s през HTTP. Силно Ви препоръчваме да настроите съвръра си да изисква HTTPS.",
+ "Setup Warning" : "Предупреждение за настройките",
+ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това ще направи няколко основни приложения недостъпни.",
+ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на кеш/акселератор като Zend OPache или eAccelerator.",
+ "Database Performance Info" : "Информация за прозиводителността на базата данни",
+ "Microsoft Windows Platform" : "Платформа Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Вашия сървър работи на Microsoft Windows. Ние горещо препоръчваме Linux за оптимално потребителско изживяване.",
"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 откриването.",
"PHP charset is not set to UTF-8" : "PHP таблицата от символи не е настроена за UTF-8",
@@ -106,7 +120,10 @@
"Locale not working" : "Местоположението не работи",
"System locale can not be set to a one which supports UTF-8." : "Системните настройки за местоположение не могат да бъдат промени на такива, подържащи UTF-8.",
"This means that there might be problems with certain characters in file names." : "Това означва, че може да има проблеми с определини символи в имената на файловете.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме инсталиране на необходимите паките на системата, за поддръжка на следните местоположения: %s.",
"URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не е в основата на вашия домейн и използва системния cron, могат да възникнат проблеми с генерирането на URLи. За избягване на тези проблеми, моля настройте <code>overwrite.cli.url</code> опцията в config.php файла с мрежовия път към вашята инсталация (Вероятно : \\\"%s\\\")",
+ "Configuration Checks" : "Проверки на конфигурацията",
"No problems found" : "Не са открити проблеми",
"Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
"Last cron was executed at %s." : "Последният cron се изпълни в %s.",
@@ -126,6 +143,7 @@
"Enforce expiration date" : "Изисквай дата на изтичане",
"Allow resharing" : "Разреши пресподеляне.",
"Restrict users to only share with users in their groups" : "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
+ "Allow users to send mail notification for shared files to other users" : "Разреши потребителите да изпращат уведомителни писма за споделени файлове към други потребители.",
"Exclude groups from sharing" : "Забрани групи да споделят",
"These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
"Enforce HTTPS" : "Изисквай HTTPS",
@@ -148,8 +166,10 @@
"Test email settings" : "Настройки на проверяващия имейл",
"Send email" : "Изпрати имейл",
"Log level" : "Детайли на доклада",
+ "Download logfile" : "Изтегли log файла",
"More" : "Още",
"Less" : "По-малко",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log файла е по-голям от 100MB. Изтеглянето му може да отнеме време!",
"Version" : "Версия",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Още приложения",
@@ -159,16 +179,22 @@
"Documentation:" : "Документация:",
"User Documentation" : "Потребителска Документация",
"Admin Documentation" : "Админ Документация",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Това приложение не може да бъде инсталирано, защото следните зависимости не са удовлетворени:",
"Update to %s" : "Обнови до %s",
"Enable only for specific groups" : "Включи само за определени групи",
"Uninstall App" : "Премахни Приложението",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здрасти,<br><br>Само да ти кажа, че имаш %s профил<br><br> Потребителя ти е: %s<br>Достъпи го: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Поздрави!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здрасти,\n\nСамо да ти кажа, че имаш %s профил.\n\nПотребителя ти е: %s\nДостъпи го: %s\n",
"Administrator Documentation" : "Административна Документация",
"Online Documentation" : "Документация в Интернет",
"Forum" : "Форум",
"Bugtracker" : "Докладвани грешки",
"Commercial Support" : "Платена Поддръжка",
"Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
+ "Desktop client" : "Клиент за настолен компютър",
+ "Android app" : "Андроид приложение",
+ "iOS app" : "iOS приложение",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
"Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.",
@@ -179,9 +205,11 @@
"New password" : "Нова парола",
"Change password" : "Промяна на паролата",
"Full Name" : "Пълно Име",
+ "No display name set" : "Няма настроено екранно име",
"Email" : "Имейл",
"Your email address" : "Твоят имейл адрес",
"Fill in an email address to enable password recovery and receive notifications" : "Въведи имейл, за да включиш функцията за възстановяване на паролата и уведомления.",
+ "No email address set" : "Няма настроен адрес на електронна поща",
"Profile picture" : "Аватар",
"Upload new" : "Качи нов",
"Select new from Files" : "Избери нов от Файловете",
@@ -205,10 +233,14 @@
"Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
"Show storage location" : "Покажи място за запис",
"Show last log in" : "Покажи последно вписване",
+ "Send email to new user" : "Изпращай писмо към нов потребител",
+ "Show email address" : "Покажи адреса на електронната поща",
"Username" : "Потребителско Име",
+ "E-Mail" : "Електронна поща",
"Create" : "Създаване",
"Admin Recovery Password" : "Възстановяване на Администраторска Парола",
"Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
+ "Search Users" : "Търси Потребители",
"Add Group" : "Добави Група",
"Group" : "Група",
"Everyone" : "Всички",
@@ -223,6 +255,7 @@
"Last Login" : "Последно Вписване",
"change full name" : "промени пълното име",
"set new password" : "сложи нова парола",
+ "change email address" : "Смени адреса на елетронната поща",
"Default" : "По подразбиране"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index e8a50e10364..4df4874ca24 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -113,7 +113,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen da se skine inline doc blokova. To će nekoliko osnovnih aplikacija učiniti nedostupnim.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator.",
"Database Performance Info" : "Info o performansi baze podataka",
- "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 se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni. Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
"Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Strogo vam preporučjem da taj modul omogućite kako biste dobili najbolje rezultate u detekciji mime vrste.",
"PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index dbf43aedd25..1bdc0aa7f52 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -111,7 +111,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen da se skine inline doc blokova. To će nekoliko osnovnih aplikacija učiniti nedostupnim.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator.",
"Database Performance Info" : "Info o performansi baze podataka",
- "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 se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni. Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
"Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Strogo vam preporučjem da taj modul omogućite kako biste dobili najbolje rezultate u detekciji mime vrste.",
"PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 3295f6e4b15..5f6ddd5854d 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -100,7 +100,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
"Database Performance Info" : "Informació del rendiment de la base de dades",
- "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'" : "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
"Module 'fileinfo' missing" : "No s'ha trobat el mòdul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
"PHP charset is not set to UTF-8" : "El codi de caràcters del php no és UTF-8",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index f60f4253b3c..94d51582752 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -98,7 +98,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
"Database Performance Info" : "Informació del rendiment de la base de dades",
- "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'" : "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
"Module 'fileinfo' missing" : "No s'ha trobat el mòdul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
"PHP charset is not set to UTF-8" : "El codi de caràcters del php no és UTF-8",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 34e4cb2b11e..177167a8423 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "nikdy",
"deleted {userName}" : "smazán {userName}",
"add group" : "přidat skupinu",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Změna hesla bude mít za následek ztrátu dat, protože jejich obnova není pro tohoto uživatele dostupná.",
"A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
"Error creating user" : "Chyba při vytváření užiatele",
"A valid password must be provided" : "Musíte zadat platné heslo",
@@ -114,7 +115,9 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
"Database Performance Info" : "Informace o výkonu databáze",
- "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'" : "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Pro migraci na jinou databázi lze použít aplikaci pro příkazový řádek: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Platforma Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server běží v prostředí Microsoft Windows. Pro optimální uživatelské pohodlí doporučujeme přejít na Linux.",
"Module 'fileinfo' missing" : "Schází modul 'fileinfo'",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 2f2b3d2e5ea..da99b1d1d51 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -85,6 +85,7 @@
"never" : "nikdy",
"deleted {userName}" : "smazán {userName}",
"add group" : "přidat skupinu",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Změna hesla bude mít za následek ztrátu dat, protože jejich obnova není pro tohoto uživatele dostupná.",
"A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
"Error creating user" : "Chyba při vytváření užiatele",
"A valid password must be provided" : "Musíte zadat platné heslo",
@@ -112,7 +113,9 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
"Database Performance Info" : "Informace o výkonu databáze",
- "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'" : "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Pro migraci na jinou databázi lze použít aplikaci pro příkazový řádek: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Platforma Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server běží v prostředí Microsoft Windows. Pro optimální uživatelské pohodlí doporučujeme přejít na Linux.",
"Module 'fileinfo' missing" : "Schází modul 'fileinfo'",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 5fed8e856a8..6baaa06c313 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "aldrig",
"deleted {userName}" : "slettede {userName}",
"add group" : "Tilføj gruppe",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Ændring af kodeordet vil føre til datatab, fordi datagendannelse ikke er tilgængelig for denne bruger",
"A valid username must be provided" : "Et gyldigt brugernavn skal angives",
"Error creating user" : "Fejl ved oprettelse af bruger",
"A valid password must be provided" : "En gyldig adgangskode skal angives",
@@ -114,13 +115,14 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
"Database Performance Info" : "Database Performance Oplysninger",
- "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 er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
- "Module 'fileinfo' missing" : "Module 'fileinfo' mangler",
+ "Microsoft Windows Platform" : "Microsoft Windows-platform",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server kører på Microsoft Windows. Vi anbefaler stærkt at anvende Linux for en optimal brugeroplevelse.",
+ "Module 'fileinfo' missing" : "Modulet 'fileinfo' mangler",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
"PHP charset is not set to UTF-8" : "PHP-tegnsættet er ikke angivet til UTF-8",
"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
- "Locale not working" : "Landestandard fungerer ikke",
- "System locale can not be set to a one which supports UTF-8." : "Systemets locale kan ikke sættes til et der bruger UTF-8.",
+ "Locale not working" : "Lokalitet fungerer ikke",
+ "System locale can not be set to a one which supports UTF-8." : "Systemets lokalitet kan ikke sættes til et der bruger UTF-8.",
"This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler kraftigt, at du installerer den krævede pakke på dit system, for at understøtte følgende lokaliteter: %s.",
"URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
@@ -131,12 +133,12 @@ OC.L10N.register(
"Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
"Cron was not executed yet!" : "Cron har ikke kørt endnu!",
- "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
+ "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
"Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
"Allow users to share via link" : "Tillad brugere at dele via link",
- "Enforce password protection" : "tving kodeords beskyttelse",
+ "Enforce password protection" : "Tving kodeords beskyttelse",
"Allow public uploads" : "Tillad offentlig upload",
"Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
"Set default expiration date" : "Vælg standard udløbsdato",
@@ -144,10 +146,10 @@ OC.L10N.register(
"days" : "dage",
"Enforce expiration date" : "Påtving udløbsdato",
"Allow resharing" : "Tillad videredeling",
- "Restrict users to only share with users in their groups" : "Begræns brugere til deling med brugere i deres gruppe",
+ "Restrict users to only share with users in their groups" : "Begræns brugere til kun at dele med brugere i deres egen gruppe",
"Allow users to send mail notification for shared files to other users" : "Tillader brugere at sende mailnotifikationer for delte filer til andre brugere",
"Exclude groups from sharing" : "Ekskluder grupper fra at dele",
- "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
+ "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, men ikke skabe dem.",
"Enforce HTTPS" : "Gennemtving HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
"Enforce HTTPS for subdomains" : "Gennemtving HTTPS for subdomæner",
@@ -207,14 +209,16 @@ OC.L10N.register(
"New password" : "Nyt kodeord",
"Change password" : "Skift kodeord",
"Full Name" : "Fulde navn",
+ "No display name set" : "Der er ikke angivet skærmnavn",
"Email" : "E-mail",
"Your email address" : "Din e-mailadresse",
"Fill in an email address to enable password recovery and receive notifications" : "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
+ "No email address set" : "Der er ikke angivet e-mailadresse",
"Profile picture" : "Profilbillede",
"Upload new" : "Upload nyt",
"Select new from Files" : "Vælg nyt fra Filer",
"Remove image" : "Fjern billede",
- "Either png or jpg. Ideally square but you will be able to crop it." : "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
+ "Either png or jpg. Ideally square but you will be able to crop it." : "Enten png eller jpg. Ideelt kvadratisk men du har mulighed for at beskære det. ",
"Your avatar is provided by your original account." : "Din avatar kommer fra din oprindelige konto.",
"Cancel" : "Annuller",
"Choose as profile image" : "Vælg som profilbillede",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 62273005111..9e263400784 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -85,6 +85,7 @@
"never" : "aldrig",
"deleted {userName}" : "slettede {userName}",
"add group" : "Tilføj gruppe",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Ændring af kodeordet vil føre til datatab, fordi datagendannelse ikke er tilgængelig for denne bruger",
"A valid username must be provided" : "Et gyldigt brugernavn skal angives",
"Error creating user" : "Fejl ved oprettelse af bruger",
"A valid password must be provided" : "En gyldig adgangskode skal angives",
@@ -112,13 +113,14 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
"Database Performance Info" : "Database Performance Oplysninger",
- "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 er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
- "Module 'fileinfo' missing" : "Module 'fileinfo' mangler",
+ "Microsoft Windows Platform" : "Microsoft Windows-platform",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server kører på Microsoft Windows. Vi anbefaler stærkt at anvende Linux for en optimal brugeroplevelse.",
+ "Module 'fileinfo' missing" : "Modulet 'fileinfo' mangler",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
"PHP charset is not set to UTF-8" : "PHP-tegnsættet er ikke angivet til UTF-8",
"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
- "Locale not working" : "Landestandard fungerer ikke",
- "System locale can not be set to a one which supports UTF-8." : "Systemets locale kan ikke sættes til et der bruger UTF-8.",
+ "Locale not working" : "Lokalitet fungerer ikke",
+ "System locale can not be set to a one which supports UTF-8." : "Systemets lokalitet kan ikke sættes til et der bruger UTF-8.",
"This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler kraftigt, at du installerer den krævede pakke på dit system, for at understøtte følgende lokaliteter: %s.",
"URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
@@ -129,12 +131,12 @@
"Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
"Cron was not executed yet!" : "Cron har ikke kørt endnu!",
- "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
+ "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
"Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
"Allow users to share via link" : "Tillad brugere at dele via link",
- "Enforce password protection" : "tving kodeords beskyttelse",
+ "Enforce password protection" : "Tving kodeords beskyttelse",
"Allow public uploads" : "Tillad offentlig upload",
"Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
"Set default expiration date" : "Vælg standard udløbsdato",
@@ -142,10 +144,10 @@
"days" : "dage",
"Enforce expiration date" : "Påtving udløbsdato",
"Allow resharing" : "Tillad videredeling",
- "Restrict users to only share with users in their groups" : "Begræns brugere til deling med brugere i deres gruppe",
+ "Restrict users to only share with users in their groups" : "Begræns brugere til kun at dele med brugere i deres egen gruppe",
"Allow users to send mail notification for shared files to other users" : "Tillader brugere at sende mailnotifikationer for delte filer til andre brugere",
"Exclude groups from sharing" : "Ekskluder grupper fra at dele",
- "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
+ "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, men ikke skabe dem.",
"Enforce HTTPS" : "Gennemtving HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
"Enforce HTTPS for subdomains" : "Gennemtving HTTPS for subdomæner",
@@ -205,14 +207,16 @@
"New password" : "Nyt kodeord",
"Change password" : "Skift kodeord",
"Full Name" : "Fulde navn",
+ "No display name set" : "Der er ikke angivet skærmnavn",
"Email" : "E-mail",
"Your email address" : "Din e-mailadresse",
"Fill in an email address to enable password recovery and receive notifications" : "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
+ "No email address set" : "Der er ikke angivet e-mailadresse",
"Profile picture" : "Profilbillede",
"Upload new" : "Upload nyt",
"Select new from Files" : "Vælg nyt fra Filer",
"Remove image" : "Fjern billede",
- "Either png or jpg. Ideally square but you will be able to crop it." : "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
+ "Either png or jpg. Ideally square but you will be able to crop it." : "Enten png eller jpg. Ideelt kvadratisk men du har mulighed for at beskære det. ",
"Your avatar is provided by your original account." : "Din avatar kommer fra din oprindelige konto.",
"Cancel" : "Annuller",
"Choose as profile image" : "Vælg som profilbillede",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 9076255b464..b9fa4d575e3 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -7,7 +7,7 @@ OC.L10N.register(
"Security" : "Sicherheit",
"Email Server" : "E-Mail-Server",
"Log" : "Log",
- "Authentication error" : "Fehler bei der Anmeldung",
+ "Authentication error" : "Authentifizierungsfehler",
"Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
"Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
"Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
@@ -74,7 +74,7 @@ OC.L10N.register(
"Strong password" : "Starkes Passwort",
"Valid until {date}" : "Gültig bis {date}",
"Delete" : "Löschen",
- "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+ "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
"Groups" : "Gruppen",
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "niemals",
"deleted {userName}" : "{userName} gelöscht",
"add group" : "Gruppe hinzufügen",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zum Datenverlust, da die Datenwiederherstellung für diesen Nutzer nicht verfügbar ist",
"A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" : "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
"A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
@@ -114,7 +115,9 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"Database Performance Info" : "Info zur Datenbankperformance",
- "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 wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“",
"Microsoft Windows Platform" : "Microsoft Windows-Plattform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
"Module 'fileinfo' missing" : "Modul 'fileinfo' fehlt ",
@@ -199,8 +202,8 @@ OC.L10N.register(
"Desktop client" : "Desktop-Client",
"Android app" : "Android-App",
"iOS app" : "iOS-App",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
- "Show First Run Wizard again" : "Erstinstallation erneut durchführen",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">beteilige Dich an der Entwicklung</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sorge dafür, dass es bekannter wird</a>!",
+ "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
"Password" : "Passwort",
"Your password was changed" : "Dein Passwort wurde geändert.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index fae5062e5c9..4b9396cfb96 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -5,7 +5,7 @@
"Security" : "Sicherheit",
"Email Server" : "E-Mail-Server",
"Log" : "Log",
- "Authentication error" : "Fehler bei der Anmeldung",
+ "Authentication error" : "Authentifizierungsfehler",
"Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
"Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
"Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
@@ -72,7 +72,7 @@
"Strong password" : "Starkes Passwort",
"Valid until {date}" : "Gültig bis {date}",
"Delete" : "Löschen",
- "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+ "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
"Groups" : "Gruppen",
@@ -85,6 +85,7 @@
"never" : "niemals",
"deleted {userName}" : "{userName} gelöscht",
"add group" : "Gruppe hinzufügen",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zum Datenverlust, da die Datenwiederherstellung für diesen Nutzer nicht verfügbar ist",
"A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" : "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
"A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
@@ -112,7 +113,9 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"Database Performance Info" : "Info zur Datenbankperformance",
- "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 wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“",
"Microsoft Windows Platform" : "Microsoft Windows-Plattform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
"Module 'fileinfo' missing" : "Modul 'fileinfo' fehlt ",
@@ -197,8 +200,8 @@
"Desktop client" : "Desktop-Client",
"Android app" : "Android-App",
"iOS app" : "iOS-App",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
- "Show First Run Wizard again" : "Erstinstallation erneut durchführen",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">beteilige Dich an der Entwicklung</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sorge dafür, dass es bekannter wird</a>!",
+ "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
"Password" : "Passwort",
"Your password was changed" : "Dein Passwort wurde geändert.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 1b3177f9375..9ed520da8fa 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -7,7 +7,7 @@ OC.L10N.register(
"Security" : "Sicherheit",
"Email Server" : "E-Mail-Server",
"Log" : "Log",
- "Authentication error" : "Authentifizierungs-Fehler",
+ "Authentication error" : "Authentifizierungsfehler",
"Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
"Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
"Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
@@ -74,7 +74,7 @@ OC.L10N.register(
"Strong password" : "Starkes Passwort",
"Valid until {date}" : "Gültig bis {date}",
"Delete" : "Löschen",
- "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+ "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
"Groups" : "Gruppen",
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "niemals",
"deleted {userName}" : "{userName} gelöscht",
"add group" : "Gruppe hinzufügen",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zum Datenverlust, da die Datenwiederherstellung für diesen Nutzer nicht verfügbar ist",
"A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
"A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
@@ -114,7 +115,9 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"Database Performance Info" : "Info zur Datenbankleistung",
- "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 wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“",
"Microsoft Windows Platform" : "Microsoft Windows-Plattform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
"Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
@@ -147,7 +150,7 @@ OC.L10N.register(
"Enforce expiration date" : "Ablaufdatum erzwingen",
"Allow resharing" : "Erlaube Weiterverteilen",
"Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
- "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden",
+ "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer 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.",
"Enforce HTTPS" : "HTTPS erzwingen",
@@ -187,7 +190,7 @@ OC.L10N.register(
"Update to %s" : "Aktualisierung auf %s",
"Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
"Uninstall App" : "App deinstallieren",
- "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>wir möchten Sie nur wissen lassen, dass Sie jetzt ein %s - Konto besitzen.<br><br>Ihr Nutzername: %s<br>Öffnen Sie es: <a href=\"%s\">%s</a><br><br>",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>wir möchten Sie nur wissen lassen, dass Sie jetzt ein %s-Konto besitzen.<br><br>Ihr Benutzername: %s<br>Greifen Sie darauf zu: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Noch einen schönen Tag!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwir möchten Sie nur wissen lassen, dass Sie jetzt ein %s - Konto besitzen\n\nIhr Nutzername: %s\nÖffnen Sie es: %s\n",
"Administrator Documentation" : "Dokumentation für Administratoren",
@@ -199,7 +202,7 @@ OC.L10N.register(
"Desktop client" : "Desktop-Client",
"Android app" : "Android-App",
"iOS app" : "iOS-App",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</a>!",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">beteilige Sie sich an der Entwicklung</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sorgen Sie dafür, dass es bekannter wird</a>!",
"Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
"Password" : "Passwort",
@@ -213,7 +216,7 @@ OC.L10N.register(
"Email" : "E-Mail",
"Your email address" : "Ihre E-Mail-Adresse",
"Fill in an email address to enable password recovery and receive notifications" : "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
- "No email address set" : "Keine E-Mail Adresse angegeben",
+ "No email address set" : "Keine E-Mail-Adresse angegeben",
"Profile picture" : "Profilbild",
"Upload new" : "Neues hochladen",
"Select new from Files" : "Neues aus Dateien wählen",
@@ -261,7 +264,7 @@ OC.L10N.register(
"Last Login" : "Letzte Anmeldung",
"change full name" : "Vollständigen Namen ändern",
"set new password" : "Neues Passwort setzen",
- "change email address" : "E-Mail Adresse ändern",
+ "change email address" : "E-Mail-Adresse ändern",
"Default" : "Standard"
},
"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index c1205620d9c..361a3aa9614 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -5,7 +5,7 @@
"Security" : "Sicherheit",
"Email Server" : "E-Mail-Server",
"Log" : "Log",
- "Authentication error" : "Authentifizierungs-Fehler",
+ "Authentication error" : "Authentifizierungsfehler",
"Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
"Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
"Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
@@ -72,7 +72,7 @@
"Strong password" : "Starkes Passwort",
"Valid until {date}" : "Gültig bis {date}",
"Delete" : "Löschen",
- "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+ "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien... Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
"Groups" : "Gruppen",
@@ -85,6 +85,7 @@
"never" : "niemals",
"deleted {userName}" : "{userName} gelöscht",
"add group" : "Gruppe hinzufügen",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zum Datenverlust, da die Datenwiederherstellung für diesen Nutzer nicht verfügbar ist",
"A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
"A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
@@ -112,7 +113,9 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
"Database Performance Info" : "Info zur Datenbankleistung",
- "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 wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“",
"Microsoft Windows Platform" : "Microsoft Windows-Plattform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
"Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
@@ -145,7 +148,7 @@
"Enforce expiration date" : "Ablaufdatum erzwingen",
"Allow resharing" : "Erlaube Weiterverteilen",
"Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
- "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden",
+ "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer 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.",
"Enforce HTTPS" : "HTTPS erzwingen",
@@ -185,7 +188,7 @@
"Update to %s" : "Aktualisierung auf %s",
"Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
"Uninstall App" : "App deinstallieren",
- "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>wir möchten Sie nur wissen lassen, dass Sie jetzt ein %s - Konto besitzen.<br><br>Ihr Nutzername: %s<br>Öffnen Sie es: <a href=\"%s\">%s</a><br><br>",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>wir möchten Sie nur wissen lassen, dass Sie jetzt ein %s-Konto besitzen.<br><br>Ihr Benutzername: %s<br>Greifen Sie darauf zu: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Noch einen schönen Tag!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwir möchten Sie nur wissen lassen, dass Sie jetzt ein %s - Konto besitzen\n\nIhr Nutzername: %s\nÖffnen Sie es: %s\n",
"Administrator Documentation" : "Dokumentation für Administratoren",
@@ -197,7 +200,7 @@
"Desktop client" : "Desktop-Client",
"Android app" : "Android-App",
"iOS app" : "iOS-App",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</a>!",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">beteilige Sie sich an der Entwicklung</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sorgen Sie dafür, dass es bekannter wird</a>!",
"Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
"Password" : "Passwort",
@@ -211,7 +214,7 @@
"Email" : "E-Mail",
"Your email address" : "Ihre E-Mail-Adresse",
"Fill in an email address to enable password recovery and receive notifications" : "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
- "No email address set" : "Keine E-Mail Adresse angegeben",
+ "No email address set" : "Keine E-Mail-Adresse angegeben",
"Profile picture" : "Profilbild",
"Upload new" : "Neues hochladen",
"Select new from Files" : "Neues aus Dateien wählen",
@@ -259,7 +262,7 @@
"Last Login" : "Letzte Anmeldung",
"change full name" : "Vollständigen Namen ändern",
"set new password" : "Neues Passwort setzen",
- "change email address" : "E-Mail Adresse ändern",
+ "change email address" : "E-Mail-Adresse ändern",
"Default" : "Standard"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 6b5c0595922..007f07ca55a 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -110,7 +110,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη 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. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-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. ",
"PHP charset is not set to UTF-8" : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 3686c4860cc..ffe355e4dc5 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -108,7 +108,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη 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. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-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. ",
"PHP charset is not set to UTF-8" : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 57af3b1a230..c0ea99cd135 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "never",
"deleted {userName}" : "deleted {userName}",
"add group" : "add group",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Changing the password will result in data loss, because data recovery is not available for this user",
"A valid username must be provided" : "A valid username must be provided",
"Error creating user" : "Error creating user",
"A valid password must be provided" : "A valid password must be provided",
@@ -114,7 +115,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
"Database Performance Info" : "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 is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Microsoft Windows Platform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.",
"Module 'fileinfo' missing" : "Module 'fileinfo' missing",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 0264878ad0a..b8a150c09de 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -85,6 +85,7 @@
"never" : "never",
"deleted {userName}" : "deleted {userName}",
"add group" : "add group",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Changing the password will result in data loss, because data recovery is not available for this user",
"A valid username must be provided" : "A valid username must be provided",
"Error creating user" : "Error creating user",
"A valid password must be provided" : "A valid password must be provided",
@@ -112,7 +113,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
"Database Performance Info" : "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 is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Microsoft Windows Platform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.",
"Module 'fileinfo' missing" : "Module 'fileinfo' missing",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 6e114758a6c..555d8844059 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "nunca",
"deleted {userName}" : "borrado {userName}",
"add group" : "añadir Grupo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar la contraseña provocará pérdida de datos porque la recuperación de datos no está disponible para este usuario",
"A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
"Error creating user" : "Error al crear usuario",
"A valid password must be provided" : "Se debe proporcionar una contraseña válida",
@@ -114,7 +115,9 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
"Database Performance Info" : "Información de rendimiento de la base de datos",
- "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'" : "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para que se sincronizan los ficheros.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Plataforma de Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
"Module 'fileinfo' missing" : "No se ha encontrado el módulo \"fileinfo\"",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index ef372d13532..22f15a8c7a7 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -85,6 +85,7 @@
"never" : "nunca",
"deleted {userName}" : "borrado {userName}",
"add group" : "añadir Grupo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar la contraseña provocará pérdida de datos porque la recuperación de datos no está disponible para este usuario",
"A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
"Error creating user" : "Error al crear usuario",
"A valid password must be provided" : "Se debe proporcionar una contraseña válida",
@@ -112,7 +113,9 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
"Database Performance Info" : "Información de rendimiento de la base de datos",
- "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'" : "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para que se sincronizan los ficheros.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Plataforma de Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
"Module 'fileinfo' missing" : "No se ha encontrado el módulo \"fileinfo\"",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index b0c08b7183b..26f18ce00fa 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -100,7 +100,6 @@ OC.L10N.register(
"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.",
"PHP charset is not set to UTF-8" : "PHP märgistik pole UTF-8",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index fea9f79bf2b..7618ee8cda2 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -98,7 +98,6 @@
"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.",
"PHP charset is not set to UTF-8" : "PHP märgistik pole UTF-8",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 081832129b3..2967d41b48b 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"settings",
{
+ "Security & Setup Warnings" : "Segurtasun eta Konfigurazio Abisuak",
"Cron" : "Cron",
"Sharing" : "Partekatzea",
"Security" : "Segurtasuna",
@@ -30,13 +31,25 @@ OC.L10N.register(
"Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
"Unable to change password" : "Ezin izan da pasahitza aldatu",
"Enabled" : "Gaitua",
+ "Not enabled" : "Gaitu gabe",
"Recommended" : "Aholkatuta",
+ "Group already exists." : "Taldea dagoeneko existitzen da",
+ "Unable to add group." : "Ezin izan da taldea gehitu.",
+ "Unable to delete group." : "Ezin izan da taldea ezabatu.",
+ "log-level out of allowed range" : "erregistro-maila baimendutako tartetik at",
"Saved" : "Gordeta",
"test email settings" : "probatu eposta ezarpenak",
"If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
"A problem occurred while sending the email. Please revise your settings." : "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
"Email sent" : "Eposta bidalia",
"You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
+ "Invalid mail address" : "Posta helbide baliogabea",
+ "Unable to create user." : "Ezin izan da erabiltzailea sortu.",
+ "Your %s account was created" : "Zure %s kontua sortu da",
+ "Unable to delete user." : "Ezin izan da erabiltzailea ezabatu.",
+ "Forbidden" : "Debekatuta",
+ "Invalid user" : "Baliogabeko erabiiltzailea",
+ "Unable to change mail address" : "Ezin izan da posta helbidea aldatu",
"Email saved" : "Eposta gorde da",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula \"{domain}\" domeinu fidagarri gisa?",
"Add trusted domain" : "Gehitu domeinu fidagarria",
@@ -74,9 +87,11 @@ OC.L10N.register(
"never" : "inoiz",
"deleted {userName}" : "{userName} ezabatuta",
"add group" : "gehitu taldea",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Pasahitza aldatzeak datuen galera eragingo du, erabiltzaile honetarako datuen berreskuratzea eskuragarri ez dagoelako",
"A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
"Error creating user" : "Errore bat egon da erabiltzailea sortzean",
"A valid password must be provided" : "Baliozko pasahitza eman behar da",
+ "A valid email must be provided" : "Baliozko posta elektronikoa eman behar da",
"__language_name__" : "Euskara",
"Personal Info" : "Informazio Pertsonala",
"SSL root certificates" : "SSL erro ziurtagiriak",
@@ -94,11 +109,14 @@ OC.L10N.register(
"TLS" : "TLS",
"Security Warning" : "Segurtasun abisua",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
+ "Read-Only config enabled" : "Bakarrik Irakurtzeko konfigurazioa gaituta",
+ "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Bakarrik irakurtzeko konfigurazioa gaitu da. Honek web-interfazearen bidez konfigurazio batzuk aldatzea ekiditzen du. Are gehiago, fitxategia eskuz ezarri behar da idazteko moduan eguneraketa bakoitzerako.",
"Setup Warning" : "Konfiguratu abisuak",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
"Database Performance Info" : "Database Performance informazioa",
- "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 erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows Plataforma",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Zure zerbitzariak Microsoft Windows erabiltzen du. Guk biziki gomendatzen dugu Linux erabiltzaile esperientza optimo bat lortzeko.",
"Module 'fileinfo' missing" : "'fileinfo' modulua falta da",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
"PHP charset is not set to UTF-8" : "PHP charset ez da UTF-8 gisa ezartzen",
@@ -106,7 +124,10 @@ OC.L10N.register(
"Locale not working" : "Lokala ez dabil",
"System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
"This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
"URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri \"overwrite.cli.url\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+ "Configuration Checks" : "Konfigurazio Egiaztapenak",
"No problems found" : "Ez da problemarik aurkitu",
"Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
"Last cron was executed at %s." : "Azken cron-a %s-etan exekutatu da",
@@ -126,10 +147,13 @@ OC.L10N.register(
"Enforce expiration date" : "Muga data betearazi",
"Allow resharing" : "Baimendu birpartekatzea",
"Restrict users to only share with users in their groups" : "Mugatu partekatzeak taldeko erabiltzaileetara",
+ "Allow users to send mail notification for shared files to other users" : "Baimendu erabiltzaileak beste erabiltzaileei epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
"Exclude groups from sharing" : "Baztertu taldeak partekatzean",
"These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
"Enforce HTTPS" : "Behartu HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
+ "Enforce HTTPS for subdomains" : "Behartu HTTPS azpidomeinuetarako",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Bezeroak %s-ra eta azpidomeinuetara konexio enkriptatu baten bidez konektatzera behartzen ditu.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
"This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
"Send mode" : "Bidaltzeko modua",
@@ -146,26 +170,35 @@ OC.L10N.register(
"Test email settings" : "Probatu eposta ezarpenak",
"Send email" : "Bidali eposta",
"Log level" : "Erregistro maila",
+ "Download logfile" : "Deskargatu log fitxategia",
"More" : "Gehiago",
"Less" : "Gutxiago",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log fitxategia 100MB baino haundiagoa da. Deskargatzeak denbora har lezake!",
"Version" : "Bertsioa",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
"More apps" : "App gehiago",
"Add your app" : "Gehitu zure aplikazioa",
"by" : " Egilea:",
+ "licensed" : "lizentziatua",
"Documentation:" : "Dokumentazioa:",
"User Documentation" : "Erabiltzaile dokumentazioa",
"Admin Documentation" : "Administrazio dokumentazioa",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako:",
"Update to %s" : "Eguneratu %sra",
"Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
"Uninstall App" : "Desinstalatu aplikazioa",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Ongi izan!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Kaixo,\n\norain %s kontu bat duzula esateko besterik ez.\n\nZure erabiltzailea: %s\nSar zaitez: %s\n\n",
"Administrator Documentation" : "Administratzaile dokumentazioa",
"Online Documentation" : "Online dokumentazioa",
"Forum" : "Foroa",
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Babes komertziala",
"Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+ "Desktop client" : "Mahaigaineko bezeroa",
+ "Android app" : "Android aplikazioa",
+ "iOS app" : "iOS aplikazioa",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
"Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
@@ -176,9 +209,11 @@ OC.L10N.register(
"New password" : "Pasahitz berria",
"Change password" : "Aldatu pasahitza",
"Full Name" : "Izena",
+ "No display name set" : "Ez da bistaratze izena ezarri",
"Email" : "E-posta",
"Your email address" : "Zure e-posta",
"Fill in an email address to enable password recovery and receive notifications" : "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
+ "No email address set" : "Ez da eposta helbidea ezarri",
"Profile picture" : "Profilaren irudia",
"Upload new" : "Igo berria",
"Select new from Files" : "Hautatu berria Fitxategietatik",
@@ -189,7 +224,10 @@ OC.L10N.register(
"Choose as profile image" : "Profil irudi bezala aukeratu",
"Language" : "Hizkuntza",
"Help translate" : "Lagundu itzultzen",
+ "Common Name" : "Izen arrunta",
+ "Valid until" : "Data hau arte baliogarria",
"Issued By" : "Honek bidalita",
+ "Valid until %s" : "%s arte baliogarria",
"Import Root Certificate" : "Inportatu erro ziurtagiria",
"The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
"Log-in password" : "Saioa hasteko pasahitza",
@@ -199,10 +237,15 @@ OC.L10N.register(
"Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
"Show storage location" : "Erakutsi biltegiaren kokapena",
"Show last log in" : "Erakutsi azkeneko saio hasiera",
+ "Show user backend" : "Bistaratu erabiltzaile motorra",
+ "Send email to new user" : "Bidali eposta erabiltzaile berriari",
+ "Show email address" : "Bistaratu eposta helbidea",
"Username" : "Erabiltzaile izena",
+ "E-Mail" : "E-posta",
"Create" : "Sortu",
"Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
"Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+ "Search Users" : "Bilatu Erabiltzaileak",
"Add Group" : "Gehitu taldea",
"Group" : "Taldea",
"Everyone" : "Edonor",
@@ -211,11 +254,14 @@ OC.L10N.register(
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
"Unlimited" : "Mugarik gabe",
"Other" : "Bestelakoa",
+ "Group Admin for" : "Talde administradorea honentzat",
"Quota" : "Kuota",
"Storage Location" : "Biltegiaren kokapena",
+ "User Backend" : "Erabiltzaile motorra",
"Last Login" : "Azken saio hasiera",
"change full name" : "aldatu izena",
"set new password" : "ezarri pasahitz berria",
+ "change email address" : "aldatu eposta helbidea",
"Default" : "Lehenetsia"
},
"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index 865c1b680b2..7b081773a41 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Security & Setup Warnings" : "Segurtasun eta Konfigurazio Abisuak",
"Cron" : "Cron",
"Sharing" : "Partekatzea",
"Security" : "Segurtasuna",
@@ -28,13 +29,25 @@
"Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
"Unable to change password" : "Ezin izan da pasahitza aldatu",
"Enabled" : "Gaitua",
+ "Not enabled" : "Gaitu gabe",
"Recommended" : "Aholkatuta",
+ "Group already exists." : "Taldea dagoeneko existitzen da",
+ "Unable to add group." : "Ezin izan da taldea gehitu.",
+ "Unable to delete group." : "Ezin izan da taldea ezabatu.",
+ "log-level out of allowed range" : "erregistro-maila baimendutako tartetik at",
"Saved" : "Gordeta",
"test email settings" : "probatu eposta ezarpenak",
"If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
"A problem occurred while sending the email. Please revise your settings." : "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
"Email sent" : "Eposta bidalia",
"You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
+ "Invalid mail address" : "Posta helbide baliogabea",
+ "Unable to create user." : "Ezin izan da erabiltzailea sortu.",
+ "Your %s account was created" : "Zure %s kontua sortu da",
+ "Unable to delete user." : "Ezin izan da erabiltzailea ezabatu.",
+ "Forbidden" : "Debekatuta",
+ "Invalid user" : "Baliogabeko erabiiltzailea",
+ "Unable to change mail address" : "Ezin izan da posta helbidea aldatu",
"Email saved" : "Eposta gorde da",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula \"{domain}\" domeinu fidagarri gisa?",
"Add trusted domain" : "Gehitu domeinu fidagarria",
@@ -72,9 +85,11 @@
"never" : "inoiz",
"deleted {userName}" : "{userName} ezabatuta",
"add group" : "gehitu taldea",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Pasahitza aldatzeak datuen galera eragingo du, erabiltzaile honetarako datuen berreskuratzea eskuragarri ez dagoelako",
"A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
"Error creating user" : "Errore bat egon da erabiltzailea sortzean",
"A valid password must be provided" : "Baliozko pasahitza eman behar da",
+ "A valid email must be provided" : "Baliozko posta elektronikoa eman behar da",
"__language_name__" : "Euskara",
"Personal Info" : "Informazio Pertsonala",
"SSL root certificates" : "SSL erro ziurtagiriak",
@@ -92,11 +107,14 @@
"TLS" : "TLS",
"Security Warning" : "Segurtasun abisua",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
+ "Read-Only config enabled" : "Bakarrik Irakurtzeko konfigurazioa gaituta",
+ "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Bakarrik irakurtzeko konfigurazioa gaitu da. Honek web-interfazearen bidez konfigurazio batzuk aldatzea ekiditzen du. Are gehiago, fitxategia eskuz ezarri behar da idazteko moduan eguneraketa bakoitzerako.",
"Setup Warning" : "Konfiguratu abisuak",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
"Database Performance Info" : "Database Performance informazioa",
- "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 erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows Plataforma",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Zure zerbitzariak Microsoft Windows erabiltzen du. Guk biziki gomendatzen dugu Linux erabiltzaile esperientza optimo bat lortzeko.",
"Module 'fileinfo' missing" : "'fileinfo' modulua falta da",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
"PHP charset is not set to UTF-8" : "PHP charset ez da UTF-8 gisa ezartzen",
@@ -104,7 +122,10 @@
"Locale not working" : "Lokala ez dabil",
"System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
"This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
"URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri \"overwrite.cli.url\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+ "Configuration Checks" : "Konfigurazio Egiaztapenak",
"No problems found" : "Ez da problemarik aurkitu",
"Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
"Last cron was executed at %s." : "Azken cron-a %s-etan exekutatu da",
@@ -124,10 +145,13 @@
"Enforce expiration date" : "Muga data betearazi",
"Allow resharing" : "Baimendu birpartekatzea",
"Restrict users to only share with users in their groups" : "Mugatu partekatzeak taldeko erabiltzaileetara",
+ "Allow users to send mail notification for shared files to other users" : "Baimendu erabiltzaileak beste erabiltzaileei epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
"Exclude groups from sharing" : "Baztertu taldeak partekatzean",
"These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
"Enforce HTTPS" : "Behartu HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
+ "Enforce HTTPS for subdomains" : "Behartu HTTPS azpidomeinuetarako",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Bezeroak %s-ra eta azpidomeinuetara konexio enkriptatu baten bidez konektatzera behartzen ditu.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
"This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
"Send mode" : "Bidaltzeko modua",
@@ -144,26 +168,35 @@
"Test email settings" : "Probatu eposta ezarpenak",
"Send email" : "Bidali eposta",
"Log level" : "Erregistro maila",
+ "Download logfile" : "Deskargatu log fitxategia",
"More" : "Gehiago",
"Less" : "Gutxiago",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Log fitxategia 100MB baino haundiagoa da. Deskargatzeak denbora har lezake!",
"Version" : "Bertsioa",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
"More apps" : "App gehiago",
"Add your app" : "Gehitu zure aplikazioa",
"by" : " Egilea:",
+ "licensed" : "lizentziatua",
"Documentation:" : "Dokumentazioa:",
"User Documentation" : "Erabiltzaile dokumentazioa",
"Admin Documentation" : "Administrazio dokumentazioa",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako:",
"Update to %s" : "Eguneratu %sra",
"Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
"Uninstall App" : "Desinstalatu aplikazioa",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Ongi izan!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Kaixo,\n\norain %s kontu bat duzula esateko besterik ez.\n\nZure erabiltzailea: %s\nSar zaitez: %s\n\n",
"Administrator Documentation" : "Administratzaile dokumentazioa",
"Online Documentation" : "Online dokumentazioa",
"Forum" : "Foroa",
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Babes komertziala",
"Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+ "Desktop client" : "Mahaigaineko bezeroa",
+ "Android app" : "Android aplikazioa",
+ "iOS app" : "iOS aplikazioa",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
"Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
@@ -174,9 +207,11 @@
"New password" : "Pasahitz berria",
"Change password" : "Aldatu pasahitza",
"Full Name" : "Izena",
+ "No display name set" : "Ez da bistaratze izena ezarri",
"Email" : "E-posta",
"Your email address" : "Zure e-posta",
"Fill in an email address to enable password recovery and receive notifications" : "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
+ "No email address set" : "Ez da eposta helbidea ezarri",
"Profile picture" : "Profilaren irudia",
"Upload new" : "Igo berria",
"Select new from Files" : "Hautatu berria Fitxategietatik",
@@ -187,7 +222,10 @@
"Choose as profile image" : "Profil irudi bezala aukeratu",
"Language" : "Hizkuntza",
"Help translate" : "Lagundu itzultzen",
+ "Common Name" : "Izen arrunta",
+ "Valid until" : "Data hau arte baliogarria",
"Issued By" : "Honek bidalita",
+ "Valid until %s" : "%s arte baliogarria",
"Import Root Certificate" : "Inportatu erro ziurtagiria",
"The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
"Log-in password" : "Saioa hasteko pasahitza",
@@ -197,10 +235,15 @@
"Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
"Show storage location" : "Erakutsi biltegiaren kokapena",
"Show last log in" : "Erakutsi azkeneko saio hasiera",
+ "Show user backend" : "Bistaratu erabiltzaile motorra",
+ "Send email to new user" : "Bidali eposta erabiltzaile berriari",
+ "Show email address" : "Bistaratu eposta helbidea",
"Username" : "Erabiltzaile izena",
+ "E-Mail" : "E-posta",
"Create" : "Sortu",
"Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
"Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+ "Search Users" : "Bilatu Erabiltzaileak",
"Add Group" : "Gehitu taldea",
"Group" : "Taldea",
"Everyone" : "Edonor",
@@ -209,11 +252,14 @@
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
"Unlimited" : "Mugarik gabe",
"Other" : "Bestelakoa",
+ "Group Admin for" : "Talde administradorea honentzat",
"Quota" : "Kuota",
"Storage Location" : "Biltegiaren kokapena",
+ "User Backend" : "Erabiltzaile motorra",
"Last Login" : "Azken saio hasiera",
"change full name" : "aldatu izena",
"set new password" : "ezarri pasahitz berria",
+ "change email address" : "aldatu eposta helbidea",
"Default" : "Lehenetsia"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index a02a13c7998..95c37296ea3 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "ei koskaan",
"deleted {userName}" : "poistettu {userName}",
"add group" : "lisää ryhmä",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Salasanan muuttaminen johtaa tietojen häviämiseen, koska tietojen palautusta ei ole käytettävissä tämän käyttäjän kohdalla",
"A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
"Error creating user" : "Virhe käyttäjää luotaessa",
"A valid password must be provided" : "Anna kelvollinen salasana",
@@ -110,7 +111,9 @@ OC.L10N.register(
"Read-Only config enabled" : "Vain luku -määritykset otettu käyttöön",
"Setup Warning" : "Asetusvaroitus",
"Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
- "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'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Suorita migraatio toiseen tietokantaan komentorivityökalulla: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Microsoft Windows -alusta",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.",
"Module 'fileinfo' missing" : "Moduuli 'fileinfo' puuttuu",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index eb945d8003b..53bf1eebb5d 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -85,6 +85,7 @@
"never" : "ei koskaan",
"deleted {userName}" : "poistettu {userName}",
"add group" : "lisää ryhmä",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Salasanan muuttaminen johtaa tietojen häviämiseen, koska tietojen palautusta ei ole käytettävissä tämän käyttäjän kohdalla",
"A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
"Error creating user" : "Virhe käyttäjää luotaessa",
"A valid password must be provided" : "Anna kelvollinen salasana",
@@ -108,7 +109,9 @@
"Read-Only config enabled" : "Vain luku -määritykset otettu käyttöön",
"Setup Warning" : "Asetusvaroitus",
"Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
- "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'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Suorita migraatio toiseen tietokantaan komentorivityökalulla: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Microsoft Windows -alusta",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.",
"Module 'fileinfo' missing" : "Moduuli 'fileinfo' puuttuu",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 72f7126a2e4..9f56de0c834 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "jamais",
"deleted {userName}" : "{userName} supprimé",
"add group" : "ajouter un groupe",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "La modification du mot de passe entrainera la perte des données car la restauration de données n'est pas disponible pour cet utilisateur",
"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",
"A valid password must be provided" : "Un mot de passe valide doit être saisi",
@@ -114,7 +115,11 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
"Database Performance Info" : "Performances de la base de données",
- "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 est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Plateforme Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
"Module 'fileinfo' missing" : "Module 'fileinfo' manquant",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
"PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
@@ -181,7 +186,7 @@ OC.L10N.register(
"Documentation:" : "Documentation :",
"User Documentation" : "Documentation utilisateur",
"Admin Documentation" : "Documentation administrateur",
- "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites:",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :",
"Update to %s" : "Mettre à niveau vers la version %s",
"Enable only for specific groups" : "Activer uniquement pour certains groupes",
"Uninstall App" : "Désinstaller l'application",
@@ -207,6 +212,7 @@ OC.L10N.register(
"New password" : "Nouveau mot de passe",
"Change password" : "Changer de mot de passe",
"Full Name" : "Nom complet",
+ "No display name set" : "Aucun nom d'affichage configuré",
"Email" : "Adresse mail",
"Your email address" : "Votre adresse e-mail",
"Fill in an email address to enable password recovery and receive notifications" : "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 70317116bb6..d9d18fd0b19 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -85,6 +85,7 @@
"never" : "jamais",
"deleted {userName}" : "{userName} supprimé",
"add group" : "ajouter un groupe",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "La modification du mot de passe entrainera la perte des données car la restauration de données n'est pas disponible pour cet utilisateur",
"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",
"A valid password must be provided" : "Un mot de passe valide doit être saisi",
@@ -112,7 +113,11 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
"Database Performance Info" : "Performances de la base de données",
- "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 est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Plateforme Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
"Module 'fileinfo' missing" : "Module 'fileinfo' manquant",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
"PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
@@ -179,7 +184,7 @@
"Documentation:" : "Documentation :",
"User Documentation" : "Documentation utilisateur",
"Admin Documentation" : "Documentation administrateur",
- "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites:",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :",
"Update to %s" : "Mettre à niveau vers la version %s",
"Enable only for specific groups" : "Activer uniquement pour certains groupes",
"Uninstall App" : "Désinstaller l'application",
@@ -205,6 +210,7 @@
"New password" : "Nouveau mot de passe",
"Change password" : "Changer de mot de passe",
"Full Name" : "Nom complet",
+ "No display name set" : "Aucun nom d'affichage configuré",
"Email" : "Adresse mail",
"Your email address" : "Votre adresse e-mail",
"Fill in an email address to enable password recovery and receive notifications" : "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 38b89b874b5..6b4f1857307 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -1,7 +1,7 @@
OC.L10N.register(
"settings",
{
- "Security & Setup Warnings" : "Seguridade & Avisos de configuración",
+ "Security & Setup Warnings" : "Avisos de seguridade e configuración",
"Cron" : "Cron",
"Sharing" : "Compartindo",
"Security" : "Seguranza",
@@ -31,7 +31,7 @@ OC.L10N.register(
"Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
"Unable to change password" : "Non é posíbel cambiar o contrasinal",
"Enabled" : "Activado",
- "Not enabled" : "Non habilitado",
+ "Not enabled" : "Non activado",
"Recommended" : "Recomendado",
"Group already exists." : "Xa existe o grupo.",
"Unable to add group." : "Non é posíbel engadir o grupo.",
@@ -40,7 +40,7 @@ OC.L10N.register(
"Saved" : "Gardado",
"test email settings" : "correo de proba dos axustes",
"If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
- "A problem occurred while sending the email. Please revise your settings." : "Produciuse un erro mentras enviaba o correo. Por favor revise a súa configuración.",
+ "A problem occurred while sending the email. Please revise your settings." : "Produciuse un erro mentres enviaba o correo. Revise os axustes.",
"Email sent" : "Correo enviado",
"You need to set your user email before being able to send test emails." : "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
"Invalid mail address" : "Enderezo de correo incorrecto",
@@ -51,7 +51,7 @@ OC.L10N.register(
"Invalid user" : "Usuario incorrecto",
"Unable to change mail address" : "Non é posíbel cambiar o enderezo de correo.",
"Email saved" : "Correo gardado",
- "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ten certeza de querer engadir \"{domain}\" como dominio de confianza?",
+ "Are you really sure you want add \"{domain}\" as trusted domain?" : "Confirma que quere engadir «{domain}» como dominio de confianza?",
"Add trusted domain" : "Engadir dominio de confianza",
"Sending..." : "Enviando...",
"All" : "Todo",
@@ -72,7 +72,7 @@ OC.L10N.register(
"So-so password" : "Contrasinal non moi aló",
"Good password" : "Bo contrasinal",
"Strong password" : "Contrasinal forte",
- "Valid until {date}" : "Válido ate {date}",
+ "Valid until {date}" : "Válido ata {date}",
"Delete" : "Eliminar",
"Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
"Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "nunca",
"deleted {userName}" : "{userName} foi eliminado",
"add group" : "engadir un grupo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar o contrasinal provocará unha perda de datos, xa que a recuperación de datos non está dispoñíbel para este usuario",
"A valid username must be provided" : "Debe fornecer un nome de usuario",
"Error creating user" : "Produciuse un erro ao crear o usuario",
"A valid password must be provided" : "Debe fornecer un contrasinal",
@@ -114,9 +115,11 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
"Database Performance Info" : "Información do rendemento da base de datos",
- "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'" : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Empregase SQLite como base de datos. Para instalacións grandes recomendámoslle que cambie a unha infraestrutura de base de datos diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconsellámoslle o uso de SQLite",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar cara outra base de datos, empregue a ferramenta en liña de ordes: «occ db:convert-type»",
"Microsoft Windows Platform" : "Plataforma Windows de Microsoft",
- "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor funciona baixo Windows de Microsoft. Recomendámoslle encarecidamente que utilice Linux para unha experiencia de usuario óptima.",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor funciona baixo Windows de Microsoft. Recomendámoslle encarecidamente que empregue Linux para obter unha perfecta experiencia de usuario.",
"Module 'fileinfo' missing" : "Non se atopou o módulo «fileinfo»",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
"PHP charset is not set to UTF-8" : "O xogo de caracteres de PHP non está estabelecido a UTF-8",
@@ -166,7 +169,7 @@ OC.L10N.register(
"Credentials" : "Credenciais",
"SMTP Username" : "Nome de usuario SMTP",
"SMTP Password" : "Contrasinal SMTP",
- "Store credentials" : "Gardar credenciais",
+ "Store credentials" : "Gardar as credenciais",
"Test email settings" : "Correo de proba dos axustes",
"Send email" : "Enviar o correo",
"Log level" : "Nivel de rexistro",
@@ -177,7 +180,7 @@ OC.L10N.register(
"Version" : "Versión",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Máis aplicativos",
- "Add your app" : "Engada o seu aplicativo",
+ "Add your app" : "Engada a súa aplicación",
"by" : "por",
"licensed" : "licencidado",
"Documentation:" : "Documentación:",
@@ -225,7 +228,7 @@ OC.L10N.register(
"Language" : "Idioma",
"Help translate" : "Axude na tradución",
"Common Name" : "Nome común",
- "Valid until" : "Válido ate",
+ "Valid until" : "Válido ata",
"Issued By" : "Proporcionado por",
"Valid until %s" : "Válido ate %s",
"Import Root Certificate" : "Importar o certificado raíz",
@@ -235,8 +238,8 @@ OC.L10N.register(
"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." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
"Restore Encryption Keys" : "Restaurar as chaves de cifrado",
"Delete Encryption Keys" : "Eliminar as chaves de cifrado",
- "Show storage location" : "Mostrar localización de almacenamento",
- "Show last log in" : "Mostrar última conexión",
+ "Show storage location" : "Amosar a localización do almacenamento",
+ "Show last log in" : "Amosar a última conexión",
"Show user backend" : "Amosar a infraestrutura do usuario",
"Send email to new user" : "Enviar correo ao novo usuario",
"Show email address" : "Amosar o enderezo de correo",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 09ede2a400c..9aea9e8b5cb 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -1,5 +1,5 @@
{ "translations": {
- "Security & Setup Warnings" : "Seguridade & Avisos de configuración",
+ "Security & Setup Warnings" : "Avisos de seguridade e configuración",
"Cron" : "Cron",
"Sharing" : "Compartindo",
"Security" : "Seguranza",
@@ -29,7 +29,7 @@
"Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
"Unable to change password" : "Non é posíbel cambiar o contrasinal",
"Enabled" : "Activado",
- "Not enabled" : "Non habilitado",
+ "Not enabled" : "Non activado",
"Recommended" : "Recomendado",
"Group already exists." : "Xa existe o grupo.",
"Unable to add group." : "Non é posíbel engadir o grupo.",
@@ -38,7 +38,7 @@
"Saved" : "Gardado",
"test email settings" : "correo de proba dos axustes",
"If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
- "A problem occurred while sending the email. Please revise your settings." : "Produciuse un erro mentras enviaba o correo. Por favor revise a súa configuración.",
+ "A problem occurred while sending the email. Please revise your settings." : "Produciuse un erro mentres enviaba o correo. Revise os axustes.",
"Email sent" : "Correo enviado",
"You need to set your user email before being able to send test emails." : "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
"Invalid mail address" : "Enderezo de correo incorrecto",
@@ -49,7 +49,7 @@
"Invalid user" : "Usuario incorrecto",
"Unable to change mail address" : "Non é posíbel cambiar o enderezo de correo.",
"Email saved" : "Correo gardado",
- "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ten certeza de querer engadir \"{domain}\" como dominio de confianza?",
+ "Are you really sure you want add \"{domain}\" as trusted domain?" : "Confirma que quere engadir «{domain}» como dominio de confianza?",
"Add trusted domain" : "Engadir dominio de confianza",
"Sending..." : "Enviando...",
"All" : "Todo",
@@ -70,7 +70,7 @@
"So-so password" : "Contrasinal non moi aló",
"Good password" : "Bo contrasinal",
"Strong password" : "Contrasinal forte",
- "Valid until {date}" : "Válido ate {date}",
+ "Valid until {date}" : "Válido ata {date}",
"Delete" : "Eliminar",
"Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
"Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
@@ -85,6 +85,7 @@
"never" : "nunca",
"deleted {userName}" : "{userName} foi eliminado",
"add group" : "engadir un grupo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar o contrasinal provocará unha perda de datos, xa que a recuperación de datos non está dispoñíbel para este usuario",
"A valid username must be provided" : "Debe fornecer un nome de usuario",
"Error creating user" : "Produciuse un erro ao crear o usuario",
"A valid password must be provided" : "Debe fornecer un contrasinal",
@@ -112,9 +113,11 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
"Database Performance Info" : "Información do rendemento da base de datos",
- "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'" : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Empregase SQLite como base de datos. Para instalacións grandes recomendámoslle que cambie a unha infraestrutura de base de datos diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconsellámoslle o uso de SQLite",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar cara outra base de datos, empregue a ferramenta en liña de ordes: «occ db:convert-type»",
"Microsoft Windows Platform" : "Plataforma Windows de Microsoft",
- "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor funciona baixo Windows de Microsoft. Recomendámoslle encarecidamente que utilice Linux para unha experiencia de usuario óptima.",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor funciona baixo Windows de Microsoft. Recomendámoslle encarecidamente que empregue Linux para obter unha perfecta experiencia de usuario.",
"Module 'fileinfo' missing" : "Non se atopou o módulo «fileinfo»",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
"PHP charset is not set to UTF-8" : "O xogo de caracteres de PHP non está estabelecido a UTF-8",
@@ -164,7 +167,7 @@
"Credentials" : "Credenciais",
"SMTP Username" : "Nome de usuario SMTP",
"SMTP Password" : "Contrasinal SMTP",
- "Store credentials" : "Gardar credenciais",
+ "Store credentials" : "Gardar as credenciais",
"Test email settings" : "Correo de proba dos axustes",
"Send email" : "Enviar o correo",
"Log level" : "Nivel de rexistro",
@@ -175,7 +178,7 @@
"Version" : "Versión",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Máis aplicativos",
- "Add your app" : "Engada o seu aplicativo",
+ "Add your app" : "Engada a súa aplicación",
"by" : "por",
"licensed" : "licencidado",
"Documentation:" : "Documentación:",
@@ -223,7 +226,7 @@
"Language" : "Idioma",
"Help translate" : "Axude na tradución",
"Common Name" : "Nome común",
- "Valid until" : "Válido ate",
+ "Valid until" : "Válido ata",
"Issued By" : "Proporcionado por",
"Valid until %s" : "Válido ate %s",
"Import Root Certificate" : "Importar o certificado raíz",
@@ -233,8 +236,8 @@
"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." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
"Restore Encryption Keys" : "Restaurar as chaves de cifrado",
"Delete Encryption Keys" : "Eliminar as chaves de cifrado",
- "Show storage location" : "Mostrar localización de almacenamento",
- "Show last log in" : "Mostrar última conexión",
+ "Show storage location" : "Amosar a localización do almacenamento",
+ "Show last log in" : "Amosar a última conexión",
"Show user backend" : "Amosar a infraestrutura do usuario",
"Send email to new user" : "Enviar correo ao novo usuario",
"Show email address" : "Amosar o enderezo de correo",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 8cac21163d6..5c8249f10eb 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -96,7 +96,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
"Database Performance Info" : "Info o performansi baze podataka",
- "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 se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
"Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
"PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 89a581b5473..65ae83d0b9a 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -94,7 +94,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
"Database Performance Info" : "Info o performansi baze podataka",
- "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 se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
"Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
"PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 1f019f760d8..03091a468fd 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -94,7 +94,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
"Database Performance Info" : "Információ az adatbázis teljesítményéről",
- "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'" : "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt: 'occ db:convert-type'",
"Module 'fileinfo' missing" : "A 'fileinfo' modul hiányzik",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
"PHP charset is not set to UTF-8" : "A PHP-karakterkészlet nem UTF-8-ra van állítva",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 1b4517ae70a..dc58dcf7112 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -92,7 +92,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
"Database Performance Info" : "Információ az adatbázis teljesítményéről",
- "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'" : "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt: 'occ db:convert-type'",
"Module 'fileinfo' missing" : "A 'fileinfo' modul hiányzik",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
"PHP charset is not set to UTF-8" : "A PHP-karakterkészlet nem UTF-8-ra van állítva",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index a64f0c10d92..d62b00d4778 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -1,7 +1,7 @@
OC.L10N.register(
"settings",
{
- "Security & Setup Warnings" : "Peringatan Keamanan dan Setelan",
+ "Security & Setup Warnings" : "Keamanan dan Setelan Peringatan",
"Cron" : "Cron",
"Sharing" : "Berbagi",
"Security" : "Keamanan",
@@ -36,14 +36,20 @@ OC.L10N.register(
"Group already exists." : "Grup sudah ada.",
"Unable to add group." : "Tidak dapat menambah grup.",
"Unable to delete group." : "Tidak dapat menghapus grup.",
+ "log-level out of allowed range" : "level-log melebihi batas yang diizinkan",
"Saved" : "Disimpan",
"test email settings" : "pengaturan email percobaan",
"If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
"A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
"Email sent" : "Email terkirim",
"You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+ "Invalid mail address" : "Alamat email salah",
"Unable to create user." : "Tidak dapat membuat pengguna.",
+ "Your %s account was created" : "Akun %s Anda telah dibuat",
"Unable to delete user." : "Tidak dapat menghapus pengguna.",
+ "Forbidden" : "Terlarang",
+ "Invalid user" : "Pengguna salah",
+ "Unable to change mail address" : "Tidak dapat mengubah alamat email",
"Email saved" : "Email disimpan",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
"Add trusted domain" : "Tambah domain terpercaya",
@@ -70,7 +76,7 @@ OC.L10N.register(
"Delete" : "Hapus",
"Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
"Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
- "Restore encryption keys." : "memulihkan kunci enkripsi.",
+ "Restore encryption keys." : "Memulihkan kunci enkripsi.",
"Groups" : "Grup",
"Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
"Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -81,9 +87,11 @@ OC.L10N.register(
"never" : "tidak pernah",
"deleted {userName}" : "menghapus {userName}",
"add group" : "tambah grup",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Pengubahan kata sandi akan ditampilkan di data kehilangan, karena data pemulihan tidak tersedia bagi pengguna ini",
"A valid username must be provided" : "Harus memberikan nama pengguna yang benar",
"Error creating user" : "Terjadi kesalahan saat membuat pengguna",
"A valid password must be provided" : "Harus memberikan sandi yang benar",
+ "A valid email must be provided" : "Email yang benar harus diberikan",
"__language_name__" : "__language_name__",
"Personal Info" : "Info Pribadi",
"SSL root certificates" : "Sertifikat root SSL",
@@ -107,7 +115,8 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
"Database Performance Info" : "Info Performa Basis Data",
- "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 akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Platform Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
"Module 'fileinfo' missing" : "Modul 'fileinfo' tidak ada",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
"PHP charset is not set to UTF-8" : "Charset PHP tidak disetel ke UTF-8",
@@ -115,7 +124,10 @@ OC.L10N.register(
"Locale not working" : "Kode pelokalan tidak berfungsi",
"System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
"This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
"URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+ "Configuration Checks" : "Pemeriksaan Konfigurasi",
"No problems found" : "Masalah tidak ditemukan",
"Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
"Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
@@ -135,10 +147,13 @@ OC.L10N.register(
"Enforce expiration date" : "Berlakukan tanggal kadaluarsa",
"Allow resharing" : "Izinkan pembagian ulang",
"Restrict users to only share with users in their groups" : "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+ "Allow users to send mail notification for shared files to other users" : "Izinkan pengguna mengirim pemberitahuan email saat berbagi berkas kepada pengguna lainnya",
"Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
"These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
"Enforce HTTPS" : "Selalu Gunakan HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
+ "Enforce HTTPS for subdomains" : "Selalu gunakan HTTPS untuk subdomain",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Paksa pengguna untuk terhubung ke %s dan subdomain via koneksi terenkripsi.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
"This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
"Send mode" : "Modus kirim",
@@ -155,8 +170,10 @@ OC.L10N.register(
"Test email settings" : "Pengaturan email percobaan",
"Send email" : "Kirim email",
"Log level" : "Level log",
+ "Download logfile" : "Unduh berkas log",
"More" : "Lainnya",
"Less" : "Ciutkan",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Menggunduhnya akan memerlukan waktu!",
"Version" : "Versi",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Lebih banyak aplikasi",
@@ -166,16 +183,22 @@ OC.L10N.register(
"Documentation:" : "Dokumentasi:",
"User Documentation" : "Dokumentasi Pengguna",
"Admin Documentation" : "Dokumentasi Admin",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Apl ini tidak dapat diinstal karena ketergantungan berikut belum terpenuhi:",
"Update to %s" : "Perbarui ke %s",
"Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
"Uninstall App" : "Copot aplikasi",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Horee!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n",
"Administrator Documentation" : "Dokumentasi Administrator",
"Online Documentation" : "Dokumentasi Online",
"Forum" : "Forum",
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Dukungan Komersial",
"Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+ "Desktop client" : "Klien desktop",
+ "Android app" : "Aplikasi Android",
+ "iOS app" : "Aplikasi iOS",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
"Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
@@ -186,9 +209,11 @@ OC.L10N.register(
"New password" : "Sandi baru",
"Change password" : "Ubah sandi",
"Full Name" : "Nama Lengkap",
+ "No display name set" : "Nama tampilan tidak diatur",
"Email" : "Email",
"Your email address" : "Alamat email Anda",
"Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
+ "No email address set" : "Alamat email tidak diatur",
"Profile picture" : "Foto profil",
"Upload new" : "Unggah baru",
"Select new from Files" : "Pilih baru dari Berkas",
@@ -212,10 +237,15 @@ OC.L10N.register(
"Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
"Show storage location" : "Tampilkan kolasi penyimpanan",
"Show last log in" : "Tampilkan masuk terakhir",
+ "Show user backend" : "Tampilkan pengguna backend",
+ "Send email to new user" : "Kirim email kepada pengguna baru",
+ "Show email address" : "Tampilkan alamat email",
"Username" : "Nama pengguna",
+ "E-Mail" : "E-Mail",
"Create" : "Buat",
"Admin Recovery Password" : "Sandi pemulihan Admin",
"Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+ "Search Users" : "Cari Pengguna",
"Add Group" : "Tambah Grup",
"Group" : "Grup",
"Everyone" : "Semua orang",
@@ -225,11 +255,13 @@ OC.L10N.register(
"Unlimited" : "Tak terbatas",
"Other" : "Lainnya",
"Group Admin for" : "Grup Admin untuk",
- "Quota" : "Quota",
+ "Quota" : "Kuota",
"Storage Location" : "Lokasi Penyimpanan",
+ "User Backend" : "Pengguna Backend",
"Last Login" : "Masuk Terakhir",
"change full name" : "ubah nama lengkap",
"set new password" : "setel sandi baru",
+ "change email address" : "ubah alamat email",
"Default" : "Default"
},
"nplurals=1; plural=0;");
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 81fe6e59fe8..6a096aa6509 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -1,5 +1,5 @@
{ "translations": {
- "Security & Setup Warnings" : "Peringatan Keamanan dan Setelan",
+ "Security & Setup Warnings" : "Keamanan dan Setelan Peringatan",
"Cron" : "Cron",
"Sharing" : "Berbagi",
"Security" : "Keamanan",
@@ -34,14 +34,20 @@
"Group already exists." : "Grup sudah ada.",
"Unable to add group." : "Tidak dapat menambah grup.",
"Unable to delete group." : "Tidak dapat menghapus grup.",
+ "log-level out of allowed range" : "level-log melebihi batas yang diizinkan",
"Saved" : "Disimpan",
"test email settings" : "pengaturan email percobaan",
"If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
"A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
"Email sent" : "Email terkirim",
"You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+ "Invalid mail address" : "Alamat email salah",
"Unable to create user." : "Tidak dapat membuat pengguna.",
+ "Your %s account was created" : "Akun %s Anda telah dibuat",
"Unable to delete user." : "Tidak dapat menghapus pengguna.",
+ "Forbidden" : "Terlarang",
+ "Invalid user" : "Pengguna salah",
+ "Unable to change mail address" : "Tidak dapat mengubah alamat email",
"Email saved" : "Email disimpan",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
"Add trusted domain" : "Tambah domain terpercaya",
@@ -68,7 +74,7 @@
"Delete" : "Hapus",
"Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
"Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
- "Restore encryption keys." : "memulihkan kunci enkripsi.",
+ "Restore encryption keys." : "Memulihkan kunci enkripsi.",
"Groups" : "Grup",
"Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
"Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -79,9 +85,11 @@
"never" : "tidak pernah",
"deleted {userName}" : "menghapus {userName}",
"add group" : "tambah grup",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Pengubahan kata sandi akan ditampilkan di data kehilangan, karena data pemulihan tidak tersedia bagi pengguna ini",
"A valid username must be provided" : "Harus memberikan nama pengguna yang benar",
"Error creating user" : "Terjadi kesalahan saat membuat pengguna",
"A valid password must be provided" : "Harus memberikan sandi yang benar",
+ "A valid email must be provided" : "Email yang benar harus diberikan",
"__language_name__" : "__language_name__",
"Personal Info" : "Info Pribadi",
"SSL root certificates" : "Sertifikat root SSL",
@@ -105,7 +113,8 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
"Database Performance Info" : "Info Performa Basis Data",
- "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 akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Platform Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
"Module 'fileinfo' missing" : "Modul 'fileinfo' tidak ada",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
"PHP charset is not set to UTF-8" : "Charset PHP tidak disetel ke UTF-8",
@@ -113,7 +122,10 @@
"Locale not working" : "Kode pelokalan tidak berfungsi",
"System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
"This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
"URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+ "Configuration Checks" : "Pemeriksaan Konfigurasi",
"No problems found" : "Masalah tidak ditemukan",
"Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
"Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
@@ -133,10 +145,13 @@
"Enforce expiration date" : "Berlakukan tanggal kadaluarsa",
"Allow resharing" : "Izinkan pembagian ulang",
"Restrict users to only share with users in their groups" : "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+ "Allow users to send mail notification for shared files to other users" : "Izinkan pengguna mengirim pemberitahuan email saat berbagi berkas kepada pengguna lainnya",
"Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
"These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
"Enforce HTTPS" : "Selalu Gunakan HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
+ "Enforce HTTPS for subdomains" : "Selalu gunakan HTTPS untuk subdomain",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Paksa pengguna untuk terhubung ke %s dan subdomain via koneksi terenkripsi.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
"This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
"Send mode" : "Modus kirim",
@@ -153,8 +168,10 @@
"Test email settings" : "Pengaturan email percobaan",
"Send email" : "Kirim email",
"Log level" : "Level log",
+ "Download logfile" : "Unduh berkas log",
"More" : "Lainnya",
"Less" : "Ciutkan",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Menggunduhnya akan memerlukan waktu!",
"Version" : "Versi",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Lebih banyak aplikasi",
@@ -164,16 +181,22 @@
"Documentation:" : "Dokumentasi:",
"User Documentation" : "Dokumentasi Pengguna",
"Admin Documentation" : "Dokumentasi Admin",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Apl ini tidak dapat diinstal karena ketergantungan berikut belum terpenuhi:",
"Update to %s" : "Perbarui ke %s",
"Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
"Uninstall App" : "Copot aplikasi",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Horee!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n",
"Administrator Documentation" : "Dokumentasi Administrator",
"Online Documentation" : "Dokumentasi Online",
"Forum" : "Forum",
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Dukungan Komersial",
"Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+ "Desktop client" : "Klien desktop",
+ "Android app" : "Aplikasi Android",
+ "iOS app" : "Aplikasi iOS",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
"Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
@@ -184,9 +207,11 @@
"New password" : "Sandi baru",
"Change password" : "Ubah sandi",
"Full Name" : "Nama Lengkap",
+ "No display name set" : "Nama tampilan tidak diatur",
"Email" : "Email",
"Your email address" : "Alamat email Anda",
"Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
+ "No email address set" : "Alamat email tidak diatur",
"Profile picture" : "Foto profil",
"Upload new" : "Unggah baru",
"Select new from Files" : "Pilih baru dari Berkas",
@@ -210,10 +235,15 @@
"Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
"Show storage location" : "Tampilkan kolasi penyimpanan",
"Show last log in" : "Tampilkan masuk terakhir",
+ "Show user backend" : "Tampilkan pengguna backend",
+ "Send email to new user" : "Kirim email kepada pengguna baru",
+ "Show email address" : "Tampilkan alamat email",
"Username" : "Nama pengguna",
+ "E-Mail" : "E-Mail",
"Create" : "Buat",
"Admin Recovery Password" : "Sandi pemulihan Admin",
"Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+ "Search Users" : "Cari Pengguna",
"Add Group" : "Tambah Grup",
"Group" : "Grup",
"Everyone" : "Semua orang",
@@ -223,11 +253,13 @@
"Unlimited" : "Tak terbatas",
"Other" : "Lainnya",
"Group Admin for" : "Grup Admin untuk",
- "Quota" : "Quota",
+ "Quota" : "Kuota",
"Storage Location" : "Lokasi Penyimpanan",
+ "User Backend" : "Pengguna Backend",
"Last Login" : "Masuk Terakhir",
"change full name" : "ubah nama lengkap",
"set new password" : "setel sandi baru",
+ "change email address" : "ubah alamat email",
"Default" : "Default"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index d33b5d60488..beb4574d216 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "mai",
"deleted {userName}" : "{userName} eliminato",
"add group" : "aggiungi gruppo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Il cambiamento della password causerà una perdita di dati, poiché il ripristino dei dati non è disponibile per questo utente",
"A valid username must be provided" : "Deve essere fornito un nome utente valido",
"Error creating user" : "Errore durante la creazione dell'utente",
"A valid password must be provided" : "Deve essere fornita una password valida",
@@ -114,7 +115,9 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
"Database Performance Info" : "Informazioni prestazioni del database",
- "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 è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Per migrare a un altro database, utilizza lo strumento da riga di comando: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Piattaforma Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.",
"Module 'fileinfo' missing" : "Modulo 'fileinfo' mancante",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 3fa9e35c447..e67e4aee3c8 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -85,6 +85,7 @@
"never" : "mai",
"deleted {userName}" : "{userName} eliminato",
"add group" : "aggiungi gruppo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Il cambiamento della password causerà una perdita di dati, poiché il ripristino dei dati non è disponibile per questo utente",
"A valid username must be provided" : "Deve essere fornito un nome utente valido",
"Error creating user" : "Errore durante la creazione dell'utente",
"A valid password must be provided" : "Deve essere fornita una password valida",
@@ -112,7 +113,9 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
"Database Performance Info" : "Informazioni prestazioni del database",
- "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 è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Per migrare a un altro database, utilizza lo strumento da riga di comando: 'occ db:convert-type'",
"Microsoft Windows Platform" : "Piattaforma Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.",
"Module 'fileinfo' missing" : "Modulo 'fileinfo' mancante",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 83d6ed21652..385156e5620 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "なし",
"deleted {userName}" : "{userName} を削除しました",
"add group" : "グループを追加",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "このユーザーのデータ復旧が無効になっていますので、パスワードを変更するとユーザーはデータに二度とアクセスできません。",
"A valid username must be provided" : "有効なユーザー名を指定する必要があります",
"Error creating user" : "ユーザー作成エラー",
"A valid password must be provided" : "有効なパスワードを指定する必要があります",
@@ -114,7 +115,8 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
"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 をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+ "Microsoft Windows Platform" : "Microsoft Windows 環境",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。",
"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タイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
"PHP charset is not set to UTF-8" : "PHP の文字コードは UTF-8 に設定されていません",
@@ -124,6 +126,7 @@ OC.L10N.register(
"This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
"URL generation in notification emails" : "通知メールにURLを生成",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
"Configuration Checks" : "設定を確認",
"No problems found" : "問題は見つかりませんでした",
"Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
@@ -196,7 +199,7 @@ OC.L10N.register(
"Desktop client" : "デスクトップクライアント",
"Android app" : "Androidアプリ",
"iOS app" : "iOSアプリ",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>!",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "プロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>!",
"Show First Run Wizard again" : "初回ウィザードを再表示する",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
"Password" : "パスワード",
@@ -206,11 +209,12 @@ OC.L10N.register(
"New password" : "新しいパスワード",
"Change password" : "パスワードを変更",
"Full Name" : "名前",
+ "No display name set" : "表示名が未設定",
"Email" : "メール",
"Your email address" : "あなたのメールアドレス",
"Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
"No email address set" : "メールアドレスが設定されていません",
- "Profile picture" : "プロフィール写真",
+ "Profile picture" : "プロフィール画像",
"Upload new" : "新たにアップロード",
"Select new from Files" : "新しいファイルを選択",
"Remove image" : "画像を削除",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index cca150fef7b..04f05c201c8 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -85,6 +85,7 @@
"never" : "なし",
"deleted {userName}" : "{userName} を削除しました",
"add group" : "グループを追加",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "このユーザーのデータ復旧が無効になっていますので、パスワードを変更するとユーザーはデータに二度とアクセスできません。",
"A valid username must be provided" : "有効なユーザー名を指定する必要があります",
"Error creating user" : "ユーザー作成エラー",
"A valid password must be provided" : "有効なパスワードを指定する必要があります",
@@ -112,7 +113,8 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
"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 をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+ "Microsoft Windows Platform" : "Microsoft Windows 環境",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。",
"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タイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
"PHP charset is not set to UTF-8" : "PHP の文字コードは UTF-8 に設定されていません",
@@ -122,6 +124,7 @@
"This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
"URL generation in notification emails" : "通知メールにURLを生成",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
"Configuration Checks" : "設定を確認",
"No problems found" : "問題は見つかりませんでした",
"Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
@@ -194,7 +197,7 @@
"Desktop client" : "デスクトップクライアント",
"Android app" : "Androidアプリ",
"iOS app" : "iOSアプリ",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>!",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "プロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>!",
"Show First Run Wizard again" : "初回ウィザードを再表示する",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
"Password" : "パスワード",
@@ -204,11 +207,12 @@
"New password" : "新しいパスワード",
"Change password" : "パスワードを変更",
"Full Name" : "名前",
+ "No display name set" : "表示名が未設定",
"Email" : "メール",
"Your email address" : "あなたのメールアドレス",
"Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
"No email address set" : "メールアドレスが設定されていません",
- "Profile picture" : "プロフィール写真",
+ "Profile picture" : "プロフィール画像",
"Upload new" : "新たにアップロード",
"Select new from Files" : "新しいファイルを選択",
"Remove image" : "画像を削除",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index d20da10e8d5..ccd082103af 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "없음",
"deleted {userName}" : "{userName} 삭제됨",
"add group" : "그룹 추가",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "이 사용자에 대해 데이터 복구를 사용할 수 없기 때문에, 암호를 변경하면 데이터를 잃게 됩니다.",
"A valid username must be provided" : "올바른 사용자 이름을 입력해야 함",
"Error creating user" : "사용자 생성 오류",
"A valid password must be provided" : "올바른 암호를 입력해야 함",
@@ -114,7 +115,11 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
"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 데이터베이스를 사용합니다. 큰 규모의 파일을 관리하는 데에는 추천하지 않습니다. 다른 데이터베이스로 이전하려면 다음 명령행 도구를 사용하십시오: 'occ db :convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정일 때는, SQLite를 사용하지 않는 것이 좋습니다.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "다른 데이터베이스로 이전하려면 다음 명령행 도구를 사용하십시오: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "마이크로소프트 윈도우 플랫폼",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "서버가 마이크로소프트 윈도우 환경에서 동작하고 있습니다. 최적의 사용자 경험을 위해서는 리눅스를 사용할 것을 권장합니다.",
"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 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
"PHP charset is not set to UTF-8" : "PHP 문자 인코딩이 UTF-8이 아님",
@@ -207,6 +212,7 @@ OC.L10N.register(
"New password" : "새 암호",
"Change password" : "암호 변경",
"Full Name" : "전체 이름",
+ "No display name set" : "표시 이름이 설정되지 않음",
"Email" : "이메일",
"Your email address" : "이메일 주소",
"Fill in an email address to enable password recovery and receive notifications" : "이메일 주소를 입력하면 암호 찾기 및 알림 수신이 가능합니다",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 91bc64f4f3d..2be72ab0631 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -85,6 +85,7 @@
"never" : "없음",
"deleted {userName}" : "{userName} 삭제됨",
"add group" : "그룹 추가",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "이 사용자에 대해 데이터 복구를 사용할 수 없기 때문에, 암호를 변경하면 데이터를 잃게 됩니다.",
"A valid username must be provided" : "올바른 사용자 이름을 입력해야 함",
"Error creating user" : "사용자 생성 오류",
"A valid password must be provided" : "올바른 암호를 입력해야 함",
@@ -112,7 +113,11 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
"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 데이터베이스를 사용합니다. 큰 규모의 파일을 관리하는 데에는 추천하지 않습니다. 다른 데이터베이스로 이전하려면 다음 명령행 도구를 사용하십시오: 'occ db :convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정일 때는, SQLite를 사용하지 않는 것이 좋습니다.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "다른 데이터베이스로 이전하려면 다음 명령행 도구를 사용하십시오: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "마이크로소프트 윈도우 플랫폼",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "서버가 마이크로소프트 윈도우 환경에서 동작하고 있습니다. 최적의 사용자 경험을 위해서는 리눅스를 사용할 것을 권장합니다.",
"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 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
"PHP charset is not set to UTF-8" : "PHP 문자 인코딩이 UTF-8이 아님",
@@ -205,6 +210,7 @@
"New password" : "새 암호",
"Change password" : "암호 변경",
"Full Name" : "전체 이름",
+ "No display name set" : "표시 이름이 설정되지 않음",
"Email" : "이메일",
"Your email address" : "이메일 주소",
"Fill in an email address to enable password recovery and receive notifications" : "이메일 주소를 입력하면 암호 찾기 및 알림 수신이 가능합니다",
diff --git a/settings/l10n/mn.js b/settings/l10n/mn.js
index 8c4c35c57cc..a0d6b1e14b1 100644
--- a/settings/l10n/mn.js
+++ b/settings/l10n/mn.js
@@ -19,6 +19,7 @@ OC.L10N.register(
"Language changed" : "Хэл солигдлоо",
"Invalid request" : "Буруу хүсэлт",
"Admins can't remove themself from the admin group" : "Админууд өөрсдийгөө Админ бүлгээс хасаж чадахгүй",
+ "Wrong password" : "Нууц үг буруу",
"All" : "Бүгд",
"Password" : "Нууц үг",
"Email" : "И-мэйл",
diff --git a/settings/l10n/mn.json b/settings/l10n/mn.json
index 1f390dd194e..b1332514713 100644
--- a/settings/l10n/mn.json
+++ b/settings/l10n/mn.json
@@ -17,6 +17,7 @@
"Language changed" : "Хэл солигдлоо",
"Invalid request" : "Буруу хүсэлт",
"Admins can't remove themself from the admin group" : "Админууд өөрсдийгөө Админ бүлгээс хасаж чадахгүй",
+ "Wrong password" : "Нууц үг буруу",
"All" : "Бүгд",
"Password" : "Нууц үг",
"Email" : "И-мэйл",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index cfb5e62e971..df94849c6f3 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "aldri",
"deleted {userName}" : "slettet {userName}",
"add group" : "legg til gruppe",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Forandring av passordet vil føre til tap av data, fordi datagjennoppretting er utilgjengelig for denne brukeren",
"A valid username must be provided" : "Oppgi et gyldig brukernavn",
"Error creating user" : "Feil ved oppretting av bruker",
"A valid password must be provided" : "Oppgi et gyldig passord",
@@ -114,7 +115,9 @@ OC.L10N.register(
"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 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'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er brukt som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
+ "Microsoft Windows Platform" : "Mocrosoft Windows Platform",
"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.",
"PHP charset is not set to UTF-8" : "PHP-tegnsett er ikke satt til UTF-8",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 0ff66420fb3..fceba046507 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -85,6 +85,7 @@
"never" : "aldri",
"deleted {userName}" : "slettet {userName}",
"add group" : "legg til gruppe",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Forandring av passordet vil føre til tap av data, fordi datagjennoppretting er utilgjengelig for denne brukeren",
"A valid username must be provided" : "Oppgi et gyldig brukernavn",
"Error creating user" : "Feil ved oppretting av bruker",
"A valid password must be provided" : "Oppgi et gyldig passord",
@@ -112,7 +113,9 @@
"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 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'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er brukt som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
+ "Microsoft Windows Platform" : "Mocrosoft Windows Platform",
"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.",
"PHP charset is not set to UTF-8" : "PHP-tegnsett er ikke satt til UTF-8",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 720f541895a..9cb1d26fb05 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "geen",
"deleted {userName}" : "verwijderd {userName}",
"add group" : "toevoegen groep",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Wijzigen van het wachtwoord leidt tot gegevensverlies, omdat gegevensherstel voor deze gebruiker niet beschikbaar is",
"A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
"Error creating user" : "Fout bij aanmaken gebruiker",
"A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
@@ -114,7 +115,11 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
"Database Performance Info" : "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 wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows Platform",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.",
"Module 'fileinfo' missing" : "Module 'fileinfo' ontbreekt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
"PHP charset is not set to UTF-8" : "PHP characterset is niet ingesteld op UTF-8",
@@ -207,6 +212,7 @@ OC.L10N.register(
"New password" : "Nieuw",
"Change password" : "Wijzig wachtwoord",
"Full Name" : "Volledige naam",
+ "No display name set" : "Nog geen weergavenaam ingesteld",
"Email" : "E-mailadres",
"Your email address" : "Uw e-mailadres",
"Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index f63ef534746..97549a6f08d 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -85,6 +85,7 @@
"never" : "geen",
"deleted {userName}" : "verwijderd {userName}",
"add group" : "toevoegen groep",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Wijzigen van het wachtwoord leidt tot gegevensverlies, omdat gegevensherstel voor deze gebruiker niet beschikbaar is",
"A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
"Error creating user" : "Fout bij aanmaken gebruiker",
"A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
@@ -112,7 +113,11 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
"Database Performance Info" : "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 wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows Platform",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.",
"Module 'fileinfo' missing" : "Module 'fileinfo' ontbreekt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
"PHP charset is not set to UTF-8" : "PHP characterset is niet ingesteld op UTF-8",
@@ -205,6 +210,7 @@
"New password" : "Nieuw",
"Change password" : "Wijzig wachtwoord",
"Full Name" : "Volledige naam",
+ "No display name set" : "Nog geen weergavenaam ingesteld",
"Email" : "E-mailadres",
"Your email address" : "Uw e-mailadres",
"Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index ed02403e464..f22ca4148d1 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"settings",
{
+ "Security & Setup Warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji",
"Cron" : "Cron",
"Sharing" : "Udostępnianie",
"Security" : "Bezpieczeństwo",
@@ -32,12 +33,23 @@ OC.L10N.register(
"Enabled" : "Włączone",
"Not enabled" : "Nie włączone",
"Recommended" : "Polecane",
+ "Group already exists." : "Grupa już istnieje.",
+ "Unable to add group." : "Nie można dodać grupy.",
+ "Unable to delete group." : "Nie można usunąć grupy.",
+ "log-level out of allowed range" : "wartość log-level spoza dozwolonego zakresu",
"Saved" : "Zapisano",
"test email settings" : "przetestuj ustawienia email",
"If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
"A problem occurred while sending the email. Please revise your settings." : "Pojawił się problem podczas wysyłania email. Proszę sprawdzić ponownie ustawienia",
"Email sent" : "E-mail wysłany",
"You need to set your user email before being able to send test emails." : "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
+ "Invalid mail address" : "Nieprawidłowy adres email",
+ "Unable to create user." : "Nie można utworzyć użytkownika.",
+ "Your %s account was created" : "Twoje konto %s zostało stworzone",
+ "Unable to delete user." : "Nie można usunąć użytkownika.",
+ "Forbidden" : "Zabronione",
+ "Invalid user" : "Nieprawidłowy użytkownik",
+ "Unable to change mail address" : "Nie można zmienić adresu email",
"Email saved" : "E-mail zapisany",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
"Add trusted domain" : "Dodaj zaufaną domenę",
@@ -75,9 +87,11 @@ OC.L10N.register(
"never" : "nigdy",
"deleted {userName}" : "usunięto {userName}",
"add group" : "dodaj grupę",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Zmiana hasła spowoduje utratę danych, ponieważ odzyskiwanie danych nie jest włączone dla tego użytkownika",
"A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
"Error creating user" : "Błąd podczas tworzenia użytkownika",
"A valid password must be provided" : "Należy podać prawidłowe hasło",
+ "A valid email must be provided" : "Podaj poprawny adres email",
"__language_name__" : "polski",
"Personal Info" : "Informacje osobiste",
"SSL root certificates" : "Główny certyfikat SSL",
@@ -99,7 +113,8 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
"Database Performance Info" : "Informacja o wydajności bazy danych",
- "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'" : "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Platforma Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Twój serwer działa na platformie Windows. Zalecamy Linuxa dla optymalnych doświadczeń użytkownika.",
"Module 'fileinfo' missing" : "Brak modułu „fileinfo”",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
"PHP charset is not set to UTF-8" : "Kodowanie PHP nie jest ustawione na UTF-8",
@@ -107,6 +122,7 @@ OC.L10N.register(
"Locale not working" : "Lokalizacja nie działa",
"System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
"This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Zalecamy instalację na Twoim systemie komponentów wymaganych do obsługi języków: %s",
"URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
"No problems found" : "Nie ma żadnych problemów",
"Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
@@ -131,6 +147,8 @@ OC.L10N.register(
"These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
"Enforce HTTPS" : "Wymuś HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+ "Enforce HTTPS for subdomains" : "Wymuś HTTPS dla subdomen",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Wymusza na klientach połączenie do %s i subdomen za pomocą połączenia szyfrowanego.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
"This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
"Send mode" : "Tryb wysyłki",
@@ -143,11 +161,14 @@ OC.L10N.register(
"Credentials" : "Poświadczenia",
"SMTP Username" : "Użytkownik SMTP",
"SMTP Password" : "Hasło SMTP",
+ "Store credentials" : "Zapisz poświadczenia",
"Test email settings" : "Ustawienia testowej wiadomości",
"Send email" : "Wyślij email",
"Log level" : "Poziom logów",
+ "Download logfile" : "Pobierz plik log",
"More" : "Więcej",
"Less" : "Mniej",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Plik log jest większy niż 100MB. Ściąganie może trochę potrwać!",
"Version" : "Wersja",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Więcej aplikacji",
@@ -157,16 +178,21 @@ OC.L10N.register(
"Documentation:" : "Dokumentacja:",
"User Documentation" : "Dokumentacja użytkownika",
"Admin Documentation" : "Dokumentacja Administratora",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Ta aplikacja nie może być zainstalowana, ponieważ nie są spełnione następujące zależności:",
"Update to %s" : "Uaktualnij do %s",
"Enable only for specific groups" : "Włącz tylko dla określonych grup",
"Uninstall App" : "Odinstaluj aplikację",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Witaj,<br><br>informujemy, że teraz masz konto na %s .<br><br>Twoja nazwa użytkownika: %s<br>Dostęp pod adresem: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Pozdrawiam!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Witaj,\n\ninformujemy, że teraz masz konto na %s .\n\nTwoja nazwa użytkownika:: %s\nDostęp pod adresem: %s\n\n",
"Administrator Documentation" : "Dokumentacja administratora",
"Online Documentation" : "Dokumentacja online",
"Forum" : "Forum",
"Bugtracker" : "Zgłaszanie błędów",
"Commercial Support" : "Wsparcie komercyjne",
"Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
+ "Android app" : "Aplikacja Android",
+ "iOS app" : "Aplikacja iOS",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
"Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
@@ -177,9 +203,11 @@ OC.L10N.register(
"New password" : "Nowe hasło",
"Change password" : "Zmień hasło",
"Full Name" : "Pełna nazwa",
+ "No display name set" : "Brak nazwa wyświetlanej",
"Email" : "Email",
"Your email address" : "Twój adres e-mail",
"Fill in an email address to enable password recovery and receive notifications" : "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
+ "No email address set" : "Brak adresu email",
"Profile picture" : "Zdjęcie profilu",
"Upload new" : "Wczytaj nowe",
"Select new from Files" : "Wybierz nowe z plików",
@@ -203,10 +231,14 @@ OC.L10N.register(
"Delete Encryption Keys" : "Usuń klucze szyfrujące",
"Show storage location" : "Pokaż miejsce przechowywania",
"Show last log in" : "Pokaż ostatni login",
+ "Send email to new user" : "Wyślij email do nowego użytkownika",
+ "Show email address" : "Pokaż adres email",
"Username" : "Nazwa użytkownika",
+ "E-Mail" : "E-mail",
"Create" : "Utwórz",
"Admin Recovery Password" : "Odzyskiwanie hasła administratora",
"Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+ "Search Users" : "Wyszukaj użytkownika",
"Add Group" : "Dodaj grupę",
"Group" : "Grupa",
"Everyone" : "Wszyscy",
@@ -221,6 +253,7 @@ OC.L10N.register(
"Last Login" : "Ostatnio zalogowany",
"change full name" : "Zmień pełna nazwę",
"set new password" : "ustaw nowe hasło",
+ "change email address" : "zmień adres email",
"Default" : "Domyślny"
},
"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 7173db87e2b..c48ee78662f 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Security & Setup Warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji",
"Cron" : "Cron",
"Sharing" : "Udostępnianie",
"Security" : "Bezpieczeństwo",
@@ -30,12 +31,23 @@
"Enabled" : "Włączone",
"Not enabled" : "Nie włączone",
"Recommended" : "Polecane",
+ "Group already exists." : "Grupa już istnieje.",
+ "Unable to add group." : "Nie można dodać grupy.",
+ "Unable to delete group." : "Nie można usunąć grupy.",
+ "log-level out of allowed range" : "wartość log-level spoza dozwolonego zakresu",
"Saved" : "Zapisano",
"test email settings" : "przetestuj ustawienia email",
"If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
"A problem occurred while sending the email. Please revise your settings." : "Pojawił się problem podczas wysyłania email. Proszę sprawdzić ponownie ustawienia",
"Email sent" : "E-mail wysłany",
"You need to set your user email before being able to send test emails." : "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
+ "Invalid mail address" : "Nieprawidłowy adres email",
+ "Unable to create user." : "Nie można utworzyć użytkownika.",
+ "Your %s account was created" : "Twoje konto %s zostało stworzone",
+ "Unable to delete user." : "Nie można usunąć użytkownika.",
+ "Forbidden" : "Zabronione",
+ "Invalid user" : "Nieprawidłowy użytkownik",
+ "Unable to change mail address" : "Nie można zmienić adresu email",
"Email saved" : "E-mail zapisany",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
"Add trusted domain" : "Dodaj zaufaną domenę",
@@ -73,9 +85,11 @@
"never" : "nigdy",
"deleted {userName}" : "usunięto {userName}",
"add group" : "dodaj grupę",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Zmiana hasła spowoduje utratę danych, ponieważ odzyskiwanie danych nie jest włączone dla tego użytkownika",
"A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
"Error creating user" : "Błąd podczas tworzenia użytkownika",
"A valid password must be provided" : "Należy podać prawidłowe hasło",
+ "A valid email must be provided" : "Podaj poprawny adres email",
"__language_name__" : "polski",
"Personal Info" : "Informacje osobiste",
"SSL root certificates" : "Główny certyfikat SSL",
@@ -97,7 +111,8 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
"Database Performance Info" : "Informacja o wydajności bazy danych",
- "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'" : "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Platforma Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Twój serwer działa na platformie Windows. Zalecamy Linuxa dla optymalnych doświadczeń użytkownika.",
"Module 'fileinfo' missing" : "Brak modułu „fileinfo”",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
"PHP charset is not set to UTF-8" : "Kodowanie PHP nie jest ustawione na UTF-8",
@@ -105,6 +120,7 @@
"Locale not working" : "Lokalizacja nie działa",
"System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
"This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Zalecamy instalację na Twoim systemie komponentów wymaganych do obsługi języków: %s",
"URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
"No problems found" : "Nie ma żadnych problemów",
"Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
@@ -129,6 +145,8 @@
"These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
"Enforce HTTPS" : "Wymuś HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+ "Enforce HTTPS for subdomains" : "Wymuś HTTPS dla subdomen",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Wymusza na klientach połączenie do %s i subdomen za pomocą połączenia szyfrowanego.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
"This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
"Send mode" : "Tryb wysyłki",
@@ -141,11 +159,14 @@
"Credentials" : "Poświadczenia",
"SMTP Username" : "Użytkownik SMTP",
"SMTP Password" : "Hasło SMTP",
+ "Store credentials" : "Zapisz poświadczenia",
"Test email settings" : "Ustawienia testowej wiadomości",
"Send email" : "Wyślij email",
"Log level" : "Poziom logów",
+ "Download logfile" : "Pobierz plik log",
"More" : "Więcej",
"Less" : "Mniej",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Plik log jest większy niż 100MB. Ściąganie może trochę potrwać!",
"Version" : "Wersja",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Więcej aplikacji",
@@ -155,16 +176,21 @@
"Documentation:" : "Dokumentacja:",
"User Documentation" : "Dokumentacja użytkownika",
"Admin Documentation" : "Dokumentacja Administratora",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Ta aplikacja nie może być zainstalowana, ponieważ nie są spełnione następujące zależności:",
"Update to %s" : "Uaktualnij do %s",
"Enable only for specific groups" : "Włącz tylko dla określonych grup",
"Uninstall App" : "Odinstaluj aplikację",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Witaj,<br><br>informujemy, że teraz masz konto na %s .<br><br>Twoja nazwa użytkownika: %s<br>Dostęp pod adresem: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Pozdrawiam!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Witaj,\n\ninformujemy, że teraz masz konto na %s .\n\nTwoja nazwa użytkownika:: %s\nDostęp pod adresem: %s\n\n",
"Administrator Documentation" : "Dokumentacja administratora",
"Online Documentation" : "Dokumentacja online",
"Forum" : "Forum",
"Bugtracker" : "Zgłaszanie błędów",
"Commercial Support" : "Wsparcie komercyjne",
"Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
+ "Android app" : "Aplikacja Android",
+ "iOS app" : "Aplikacja iOS",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
"Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
@@ -175,9 +201,11 @@
"New password" : "Nowe hasło",
"Change password" : "Zmień hasło",
"Full Name" : "Pełna nazwa",
+ "No display name set" : "Brak nazwa wyświetlanej",
"Email" : "Email",
"Your email address" : "Twój adres e-mail",
"Fill in an email address to enable password recovery and receive notifications" : "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
+ "No email address set" : "Brak adresu email",
"Profile picture" : "Zdjęcie profilu",
"Upload new" : "Wczytaj nowe",
"Select new from Files" : "Wybierz nowe z plików",
@@ -201,10 +229,14 @@
"Delete Encryption Keys" : "Usuń klucze szyfrujące",
"Show storage location" : "Pokaż miejsce przechowywania",
"Show last log in" : "Pokaż ostatni login",
+ "Send email to new user" : "Wyślij email do nowego użytkownika",
+ "Show email address" : "Pokaż adres email",
"Username" : "Nazwa użytkownika",
+ "E-Mail" : "E-mail",
"Create" : "Utwórz",
"Admin Recovery Password" : "Odzyskiwanie hasła administratora",
"Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+ "Search Users" : "Wyszukaj użytkownika",
"Add Group" : "Dodaj grupę",
"Group" : "Grupa",
"Everyone" : "Wszyscy",
@@ -219,6 +251,7 @@
"Last Login" : "Ostatnio zalogowany",
"change full name" : "Zmień pełna nazwę",
"set new password" : "ustaw nowe hasło",
+ "change email address" : "zmień adres email",
"Default" : "Domyślny"
},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
} \ No newline at end of file
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index b55fa78e1cd..98741abc916 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "nunca",
"deleted {userName}" : "eliminado {userName}",
"add group" : "adicionar grupo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Trocar a senha irá resultar em perda de dados, porque recuperação de dados não está disponível para este usuário",
"A valid username must be provided" : "Forneça um nome de usuário válido",
"Error creating user" : "Erro ao criar usuário",
"A valid password must be provided" : "Forneça uma senha válida",
@@ -114,7 +115,9 @@ OC.L10N.register(
"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 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 switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type'",
"Microsoft Windows Platform" : "Plataforma Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.",
"Module 'fileinfo' missing" : "Módulo 'fileinfo' faltando",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index b46bfedb48e..05aaa0157b8 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -85,6 +85,7 @@
"never" : "nunca",
"deleted {userName}" : "eliminado {userName}",
"add group" : "adicionar grupo",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Trocar a senha irá resultar em perda de dados, porque recuperação de dados não está disponível para este usuário",
"A valid username must be provided" : "Forneça um nome de usuário válido",
"Error creating user" : "Erro ao criar usuário",
"A valid password must be provided" : "Forneça uma senha válida",
@@ -112,7 +113,9 @@
"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 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 switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type'",
"Microsoft Windows Platform" : "Plataforma Microsoft Windows",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.",
"Module 'fileinfo' missing" : "Módulo 'fileinfo' faltando",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index ce2e707597e..31afe303115 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"A valid username must be provided" : "Deve ser indicado um nome de utilizador válido",
"Error creating user" : "Ocorreu um erro ao criar o utilizador",
"A valid password must be provided" : "Deve ser indicada uma palavra-passe válida",
+ "A valid email must be provided" : "Deve ser fornecido um email válido",
"__language_name__" : "__language_name__",
"Personal Info" : "Informação Pessoal",
"SSL root certificates" : "Certificados de raiz SSL",
@@ -110,7 +111,8 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
"Database Performance Info" : "Informação do Desempenho da Base 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 é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
+ "Microsoft Windows Platform" : "Plataforma Microsoft Windows ",
"Module 'fileinfo' missing" : "Módulo 'fileinfo' em falta",
"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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
"PHP charset is not set to UTF-8" : "O conjunto de carateres PHP não está definido para UTF-8",
@@ -182,6 +184,7 @@ OC.L10N.register(
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Suporte Comercial",
"Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
+ "Desktop client" : "Cliente Desktop",
"Android app" : "Aplicação Android",
"iOS app" : "Aplicação iOS",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index e6414eee113..8211c024c5b 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -85,6 +85,7 @@
"A valid username must be provided" : "Deve ser indicado um nome de utilizador válido",
"Error creating user" : "Ocorreu um erro ao criar o utilizador",
"A valid password must be provided" : "Deve ser indicada uma palavra-passe válida",
+ "A valid email must be provided" : "Deve ser fornecido um email válido",
"__language_name__" : "__language_name__",
"Personal Info" : "Informação Pessoal",
"SSL root certificates" : "Certificados de raiz SSL",
@@ -108,7 +109,8 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
"Database Performance Info" : "Informação do Desempenho da Base 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 é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
+ "Microsoft Windows Platform" : "Plataforma Microsoft Windows ",
"Module 'fileinfo' missing" : "Módulo 'fileinfo' em falta",
"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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
"PHP charset is not set to UTF-8" : "O conjunto de carateres PHP não está definido para UTF-8",
@@ -180,6 +182,7 @@
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Suporte Comercial",
"Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
+ "Desktop client" : "Cliente Desktop",
"Android app" : "Aplicação Android",
"iOS app" : "Aplicação iOS",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 0ff335755d3..83edce29d60 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -1,8 +1,8 @@
OC.L10N.register(
"settings",
{
- "Security & Setup Warnings" : "Предупреждения безопасности и инсталляции",
- "Cron" : "Планировщик задач по расписанию",
+ "Security & Setup Warnings" : "Предупреждения безопасности и настроек",
+ "Cron" : "Cron (планировщик задач)",
"Sharing" : "Общий доступ",
"Security" : "Безопасность",
"Email Server" : "Почтовый сервер",
@@ -10,40 +10,40 @@ OC.L10N.register(
"Authentication error" : "Ошибка аутентификации",
"Your full name has been changed." : "Ваше полное имя было изменено.",
"Unable to change full name" : "Невозможно изменить полное имя",
- "Files decrypted successfully" : "Дешифрование файлов прошло успешно",
+ "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" : "Ошибка при дешифровании файлов. Проверьте пароль и повторите попытку",
+ "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." : "Невозможно удалить приложение.",
- "Backups restored successfully" : "Резервная копия успешно восстановлена",
+ "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",
+ "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы администраторов",
"Unable to add user to group %s" : "Невозможно добавить пользователя в группу %s",
"Unable to remove user from group %s" : "Невозможно удалить пользователя из группы %s",
"Couldn't update app." : "Невозможно обновить приложение",
"Wrong password" : "Неправильный пароль",
"No user supplied" : "Пользователь не задан",
- "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите администраторский пароль восстановления, иначе все пользовательские данные будут утеряны",
- "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
+ "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите пароль восстановления администратора, в противном случае все пользовательские данные будут утеряны",
+ "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления администратора. Проверьте пароль и попробуйте еще раз.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
"Unable to change password" : "Невозможно изменить пароль",
"Enabled" : "Включено",
- "Not enabled" : "Выключено",
+ "Not enabled" : "Не включено",
"Recommended" : "Рекомендовано",
"Group already exists." : "Группа уже существует.",
"Unable to add group." : "Невозможно добавить группу.",
"Unable to delete group." : "Невозможно удалить группу.",
- "log-level out of allowed range" : "Уровень журнала вышел за разрешенный диапазон",
+ "log-level out of allowed range" : "уровень журнала вышел за разрешенный диапазон",
"Saved" : "Сохранено",
"test email settings" : "проверить настройки почты",
- "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
- "A problem occurred while sending the email. Please revise your settings." : "Возникла проблема при отправке письма. Проверьте ваши настройки.",
+ "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, значит настройки верны.",
+ "A problem occurred while sending the email. Please revise your settings." : "Возникла проблема при отправке письма. Пожалуйста проверьте ваши настройки.",
"Email sent" : "Письмо отправлено",
"You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
- "Invalid mail address" : "Некорректный почтовый адрес",
+ "Invalid mail address" : "Некорректный адрес email",
"Unable to create user." : "Невозможно создать пользователя.",
"Your %s account was created" : "Учетная запись %s создана",
"Unable to delete user." : "Невозможно удалить пользователя.",
@@ -55,16 +55,16 @@ OC.L10N.register(
"Add trusted domain" : "Добавить доверенный домен",
"Sending..." : "Отправляется ...",
"All" : "Все",
- "Please wait...." : "Подождите...",
- "Error while disabling app" : "Ошибка отключения приложения",
+ "Please wait...." : "Пожалуйста подождите...",
+ "Error while disabling app" : "Ошибка при отключении приложения",
"Disable" : "Выключить",
"Enable" : "Включить",
- "Error while enabling app" : "Ошибка включения приложения",
+ "Error while enabling app" : "Ошибка при включении приложения",
"Updating...." : "Обновление...",
"Error while updating app" : "Ошибка при обновлении приложения",
"Updated" : "Обновлено",
"Uninstalling ...." : "Удаление ...",
- "Error while uninstalling app" : "Ошибка при удалении приложения.",
+ "Error while uninstalling app" : "Ошибка при удалении приложения",
"Uninstall" : "Удалить",
"Select a profile picture" : "Выберите аватар",
"Very weak password" : "Очень слабый пароль",
@@ -74,24 +74,25 @@ OC.L10N.register(
"Strong password" : "Стойкий пароль",
"Valid until {date}" : "Действительно до {дата}",
"Delete" : "Удалить",
- "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+ "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста подождите, это может занять некоторое время.",
"Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
"Restore encryption keys." : "Восстановить ключи шифрования.",
"Groups" : "Группы",
"Unable to delete {objName}" : "Невозможно удалить {objName}",
"Error creating group" : "Ошибка создания группы",
"A valid group name must be provided" : "Введите правильное имя группы",
- "deleted {groupName}" : "удалено {groupName}",
+ "deleted {groupName}" : "удалена {groupName}",
"undo" : "отмена",
- "no group" : "Нет группы",
+ "no group" : "без группы",
"never" : "никогда",
"deleted {userName}" : "удалён {userName}",
"add group" : "добавить группу",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Изменение пароля приведёт к потере данных, так как восстановление данных не доступно для этого пользователя",
"A valid username must be provided" : "Укажите правильное имя пользователя",
"Error creating user" : "Ошибка создания пользователя",
- "A valid password must be provided" : "Предоставьте корректный пароль",
- "A valid email must be provided" : "Введите корректный адрес email",
- "__language_name__" : "Русский ",
+ "A valid password must be provided" : "Должен быть указан правильный пароль",
+ "A valid email must be provided" : "Должен быть указан корректный адрес email",
+ "__language_name__" : "Русский",
"Personal Info" : "Личная информация",
"SSL root certificates" : "Корневые сертификаты SSL",
"Encryption" : "Шифрование",
@@ -103,51 +104,55 @@ OC.L10N.register(
"None" : "Отсутствует",
"Login" : "Логин",
"Plain" : "Простой",
- "NT LAN Manager" : "Мендеджер NT LAN",
+ "NT LAN Manager" : "Менеджер NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
"Security Warning" : "Предупреждение безопасности",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS.",
- "Read-Only config enabled" : "Конфигурационный файл в режиме только для чтения.",
- "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса не возможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
+ "Read-Only config enabled" : "Конфигурационный файл в режиме только для чтения",
+ "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
"Setup Warning" : "Предупреждение установки",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
"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'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Платформа Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер работает на ОС Microsoft Windows. Мы настоятельно рекомендуем использовать ОС семейства Linux для достижения наилучших условий использования.",
"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) файлов.",
- "PHP charset is not set to UTF-8" : "Кодировка PHP не совпадает с UTF-8",
- "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
+ "PHP charset is not set to UTF-8" : "Кодировка PHP не установлена на UTF-8",
+ "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не установлена на UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
"Locale not working" : "Локализация не работает",
"System locale can not be set to a one which supports UTF-8." : "Невозможно установить системную локаль, поддерживающую UTF-8",
"This means that there might be problems with certain characters in file names." : "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Мы рекомендуем установить требуемые пакеты для вашей системы для поддержки одного из следующих языков: %s.",
- "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
- "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
+ "URL generation in notification emails" : "Генерация URL в письмах уведомлениях",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует системный планировщик cron, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
"Configuration Checks" : "Проверка конфигурации",
"No problems found" : "Проблемы не найдены",
"Please double check the <a href='%s'>installation guides</a>." : "Подробно изучите <a href='%s'>инструкции по установке</a>.",
- "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-задачи ещё не запускались!",
+ "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.",
+ "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
"Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
"Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
"Enforce password protection" : "Защита паролем обязательна",
- "Allow public uploads" : "Разрешить открытые загрузки",
- "Allow users to send mail notification for shared files" : "Разрешить пользователям оповещать почтой об открытии доступа к файлам",
- "Set default expiration date" : "Установить срок действия по-умолчанию",
- "Expire after " : "Заканчивается через",
+ "Allow public uploads" : "Разрешить открытые/публичные загрузки",
+ "Allow users to send mail notification for shared files" : "Разрешить пользователям отправлять email об открытии доступа к файлам",
+ "Set default expiration date" : "Установить дату истечения по умолчанию",
+ "Expire after " : "Истечение через",
"days" : "дней",
"Enforce expiration date" : "Срок действия обязателен",
"Allow resharing" : "Разрешить повторное открытие общего доступа",
"Restrict users to only share with users in their groups" : "Разрешить пользователям делиться только с членами их групп",
- "Allow users to send mail notification for shared files to other users" : "Разрешить пользователям оповещать почтой других пользователей об открытии доступа к файлам",
+ "Allow users to send mail notification for shared files to other users" : "Разрешить пользователям отправлять оповещение других пользователей об открытии доступа к файлам",
"Exclude groups from sharing" : "Исключить группы из общего доступа",
- "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их принять.",
+ "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их создавать.",
"Enforce HTTPS" : "HTTPS соединение обязательно",
"Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
"Enforce HTTPS for subdomains" : "HTTPS соединение обязательно для субдоменов",
@@ -185,7 +190,7 @@ OC.L10N.register(
"Update to %s" : "Обновить до %s",
"Enable only for specific groups" : "Включить только для этих групп",
"Uninstall App" : "Удалить приложение",
- "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>Просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Удачи!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здравствуйте,\n\nПросто хотим сообщить, что теперь у вас есть учетная запись на %s.\n\nИмя пользователя: %s\nЗайти: %s\n",
"Administrator Documentation" : "Документация администратора",
@@ -197,18 +202,19 @@ OC.L10N.register(
"Desktop client" : "Клиент для ПК",
"Android app" : "Android приложение",
"iOS app" : "iOS приложение",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
- "Show First Run Wizard again" : "Показать помощник настройки",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
+ "Show First Run Wizard again" : "Показать помощник настройки снова",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
"Password" : "Пароль",
- "Your password was changed" : "Пароль изменён",
+ "Your password was changed" : "Ваш пароль был изменён",
"Unable to change your password" : "Невозможно сменить пароль",
"Current password" : "Текущий пароль",
"New password" : "Новый пароль",
"Change password" : "Сменить пароль",
"Full Name" : "Полное имя",
+ "No display name set" : "Отображаемое имя не указано",
"Email" : "E-mail",
- "Your email address" : "Адрес электронной почты",
+ "Your email address" : "Ваш адрес электронной почты",
"Fill in an email address to enable password recovery and receive notifications" : "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
"No email address set" : "E-mail не указан",
"Profile picture" : "Аватар",
@@ -217,7 +223,7 @@ OC.L10N.register(
"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" : "Отменить",
+ "Cancel" : "Отмена",
"Choose as profile image" : "Установить как аватар",
"Language" : "Язык",
"Help translate" : "Помочь с переводом",
@@ -226,15 +232,15 @@ OC.L10N.register(
"Issued By" : "Выдан",
"Valid until %s" : "Действительно до %s",
"Import Root Certificate" : "Импортировать корневые сертификаты",
- "The encryption app is no longer enabled, please decrypt all your files" : "Приложение шифрования выключено, расшифруйте все ваши файлы",
+ "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." : "Ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+ "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" : "Удалить Ключи Шифрования",
"Show storage location" : "Показать местонахождение хранилища",
"Show last log in" : "Показать последний вход в систему",
- "Show user backend" : "Показать пользовательский бэкенд",
+ "Show user backend" : "Показать пользовательскую часть",
"Send email to new user" : "Отправлять сообщение на email новому пользователю",
"Show email address" : "Показывать адрес email",
"Username" : "Имя пользователя",
@@ -242,19 +248,19 @@ OC.L10N.register(
"Create" : "Создать",
"Admin Recovery Password" : "Восстановление пароля администратора",
"Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
- "Search Users" : "Искать пользователей",
+ "Search Users" : "Поиск пользователей",
"Add Group" : "Добавить группу",
"Group" : "Группа",
"Everyone" : "Все",
"Admins" : "Администраторы",
"Default Quota" : "Квота по умолчанию",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
- "Unlimited" : "Неограниченно",
- "Other" : "Другое",
+ "Unlimited" : "Неограничено",
+ "Other" : "Другая",
"Group Admin for" : "Для группы Администраторов",
"Quota" : "Квота",
"Storage Location" : "Место хранилища",
- "User Backend" : "Пользовательский бэкенд",
+ "User Backend" : "Пользовательская часть",
"Last Login" : "Последний вход",
"change full name" : "изменить полное имя",
"set new password" : "установить новый пароль",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 29d621c40c5..7a58f19d8ce 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -1,6 +1,6 @@
{ "translations": {
- "Security & Setup Warnings" : "Предупреждения безопасности и инсталляции",
- "Cron" : "Планировщик задач по расписанию",
+ "Security & Setup Warnings" : "Предупреждения безопасности и настроек",
+ "Cron" : "Cron (планировщик задач)",
"Sharing" : "Общий доступ",
"Security" : "Безопасность",
"Email Server" : "Почтовый сервер",
@@ -8,40 +8,40 @@
"Authentication error" : "Ошибка аутентификации",
"Your full name has been changed." : "Ваше полное имя было изменено.",
"Unable to change full name" : "Невозможно изменить полное имя",
- "Files decrypted successfully" : "Дешифрование файлов прошло успешно",
+ "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" : "Ошибка при дешифровании файлов. Проверьте пароль и повторите попытку",
+ "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." : "Невозможно удалить приложение.",
- "Backups restored successfully" : "Резервная копия успешно восстановлена",
+ "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",
+ "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы администраторов",
"Unable to add user to group %s" : "Невозможно добавить пользователя в группу %s",
"Unable to remove user from group %s" : "Невозможно удалить пользователя из группы %s",
"Couldn't update app." : "Невозможно обновить приложение",
"Wrong password" : "Неправильный пароль",
"No user supplied" : "Пользователь не задан",
- "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите администраторский пароль восстановления, иначе все пользовательские данные будут утеряны",
- "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
+ "Please provide an admin recovery password, otherwise all user data will be lost" : "Введите пароль восстановления администратора, в противном случае все пользовательские данные будут утеряны",
+ "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления администратора. Проверьте пароль и попробуйте еще раз.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
"Unable to change password" : "Невозможно изменить пароль",
"Enabled" : "Включено",
- "Not enabled" : "Выключено",
+ "Not enabled" : "Не включено",
"Recommended" : "Рекомендовано",
"Group already exists." : "Группа уже существует.",
"Unable to add group." : "Невозможно добавить группу.",
"Unable to delete group." : "Невозможно удалить группу.",
- "log-level out of allowed range" : "Уровень журнала вышел за разрешенный диапазон",
+ "log-level out of allowed range" : "уровень журнала вышел за разрешенный диапазон",
"Saved" : "Сохранено",
"test email settings" : "проверить настройки почты",
- "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
- "A problem occurred while sending the email. Please revise your settings." : "Возникла проблема при отправке письма. Проверьте ваши настройки.",
+ "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, значит настройки верны.",
+ "A problem occurred while sending the email. Please revise your settings." : "Возникла проблема при отправке письма. Пожалуйста проверьте ваши настройки.",
"Email sent" : "Письмо отправлено",
"You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
- "Invalid mail address" : "Некорректный почтовый адрес",
+ "Invalid mail address" : "Некорректный адрес email",
"Unable to create user." : "Невозможно создать пользователя.",
"Your %s account was created" : "Учетная запись %s создана",
"Unable to delete user." : "Невозможно удалить пользователя.",
@@ -53,16 +53,16 @@
"Add trusted domain" : "Добавить доверенный домен",
"Sending..." : "Отправляется ...",
"All" : "Все",
- "Please wait...." : "Подождите...",
- "Error while disabling app" : "Ошибка отключения приложения",
+ "Please wait...." : "Пожалуйста подождите...",
+ "Error while disabling app" : "Ошибка при отключении приложения",
"Disable" : "Выключить",
"Enable" : "Включить",
- "Error while enabling app" : "Ошибка включения приложения",
+ "Error while enabling app" : "Ошибка при включении приложения",
"Updating...." : "Обновление...",
"Error while updating app" : "Ошибка при обновлении приложения",
"Updated" : "Обновлено",
"Uninstalling ...." : "Удаление ...",
- "Error while uninstalling app" : "Ошибка при удалении приложения.",
+ "Error while uninstalling app" : "Ошибка при удалении приложения",
"Uninstall" : "Удалить",
"Select a profile picture" : "Выберите аватар",
"Very weak password" : "Очень слабый пароль",
@@ -72,24 +72,25 @@
"Strong password" : "Стойкий пароль",
"Valid until {date}" : "Действительно до {дата}",
"Delete" : "Удалить",
- "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+ "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста подождите, это может занять некоторое время.",
"Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
"Restore encryption keys." : "Восстановить ключи шифрования.",
"Groups" : "Группы",
"Unable to delete {objName}" : "Невозможно удалить {objName}",
"Error creating group" : "Ошибка создания группы",
"A valid group name must be provided" : "Введите правильное имя группы",
- "deleted {groupName}" : "удалено {groupName}",
+ "deleted {groupName}" : "удалена {groupName}",
"undo" : "отмена",
- "no group" : "Нет группы",
+ "no group" : "без группы",
"never" : "никогда",
"deleted {userName}" : "удалён {userName}",
"add group" : "добавить группу",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Изменение пароля приведёт к потере данных, так как восстановление данных не доступно для этого пользователя",
"A valid username must be provided" : "Укажите правильное имя пользователя",
"Error creating user" : "Ошибка создания пользователя",
- "A valid password must be provided" : "Предоставьте корректный пароль",
- "A valid email must be provided" : "Введите корректный адрес email",
- "__language_name__" : "Русский ",
+ "A valid password must be provided" : "Должен быть указан правильный пароль",
+ "A valid email must be provided" : "Должен быть указан корректный адрес email",
+ "__language_name__" : "Русский",
"Personal Info" : "Личная информация",
"SSL root certificates" : "Корневые сертификаты SSL",
"Encryption" : "Шифрование",
@@ -101,51 +102,55 @@
"None" : "Отсутствует",
"Login" : "Логин",
"Plain" : "Простой",
- "NT LAN Manager" : "Мендеджер NT LAN",
+ "NT LAN Manager" : "Менеджер NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
"Security Warning" : "Предупреждение безопасности",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS.",
- "Read-Only config enabled" : "Конфигурационный файл в режиме только для чтения.",
- "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса не возможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
+ "Read-Only config enabled" : "Конфигурационный файл в режиме только для чтения",
+ "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
"Setup Warning" : "Предупреждение установки",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
"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'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Платформа Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер работает на ОС Microsoft Windows. Мы настоятельно рекомендуем использовать ОС семейства Linux для достижения наилучших условий использования.",
"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) файлов.",
- "PHP charset is not set to UTF-8" : "Кодировка PHP не совпадает с UTF-8",
- "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
+ "PHP charset is not set to UTF-8" : "Кодировка PHP не установлена на UTF-8",
+ "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не установлена на UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
"Locale not working" : "Локализация не работает",
"System locale can not be set to a one which supports UTF-8." : "Невозможно установить системную локаль, поддерживающую UTF-8",
"This means that there might be problems with certain characters in file names." : "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Мы рекомендуем установить требуемые пакеты для вашей системы для поддержки одного из следующих языков: %s.",
- "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
- "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
+ "URL generation in notification emails" : "Генерация URL в письмах уведомлениях",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует системный планировщик cron, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
"Configuration Checks" : "Проверка конфигурации",
"No problems found" : "Проблемы не найдены",
"Please double check the <a href='%s'>installation guides</a>." : "Подробно изучите <a href='%s'>инструкции по установке</a>.",
- "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-задачи ещё не запускались!",
+ "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.",
+ "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
"Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
"Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
"Enforce password protection" : "Защита паролем обязательна",
- "Allow public uploads" : "Разрешить открытые загрузки",
- "Allow users to send mail notification for shared files" : "Разрешить пользователям оповещать почтой об открытии доступа к файлам",
- "Set default expiration date" : "Установить срок действия по-умолчанию",
- "Expire after " : "Заканчивается через",
+ "Allow public uploads" : "Разрешить открытые/публичные загрузки",
+ "Allow users to send mail notification for shared files" : "Разрешить пользователям отправлять email об открытии доступа к файлам",
+ "Set default expiration date" : "Установить дату истечения по умолчанию",
+ "Expire after " : "Истечение через",
"days" : "дней",
"Enforce expiration date" : "Срок действия обязателен",
"Allow resharing" : "Разрешить повторное открытие общего доступа",
"Restrict users to only share with users in their groups" : "Разрешить пользователям делиться только с членами их групп",
- "Allow users to send mail notification for shared files to other users" : "Разрешить пользователям оповещать почтой других пользователей об открытии доступа к файлам",
+ "Allow users to send mail notification for shared files to other users" : "Разрешить пользователям отправлять оповещение других пользователей об открытии доступа к файлам",
"Exclude groups from sharing" : "Исключить группы из общего доступа",
- "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их принять.",
+ "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их создавать.",
"Enforce HTTPS" : "HTTPS соединение обязательно",
"Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
"Enforce HTTPS for subdomains" : "HTTPS соединение обязательно для субдоменов",
@@ -183,7 +188,7 @@
"Update to %s" : "Обновить до %s",
"Enable only for specific groups" : "Включить только для этих групп",
"Uninstall App" : "Удалить приложение",
- "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>Просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Удачи!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здравствуйте,\n\nПросто хотим сообщить, что теперь у вас есть учетная запись на %s.\n\nИмя пользователя: %s\nЗайти: %s\n",
"Administrator Documentation" : "Документация администратора",
@@ -195,18 +200,19 @@
"Desktop client" : "Клиент для ПК",
"Android app" : "Android приложение",
"iOS app" : "iOS приложение",
- "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
- "Show First Run Wizard again" : "Показать помощник настройки",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
+ "Show First Run Wizard again" : "Показать помощник настройки снова",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
"Password" : "Пароль",
- "Your password was changed" : "Пароль изменён",
+ "Your password was changed" : "Ваш пароль был изменён",
"Unable to change your password" : "Невозможно сменить пароль",
"Current password" : "Текущий пароль",
"New password" : "Новый пароль",
"Change password" : "Сменить пароль",
"Full Name" : "Полное имя",
+ "No display name set" : "Отображаемое имя не указано",
"Email" : "E-mail",
- "Your email address" : "Адрес электронной почты",
+ "Your email address" : "Ваш адрес электронной почты",
"Fill in an email address to enable password recovery and receive notifications" : "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
"No email address set" : "E-mail не указан",
"Profile picture" : "Аватар",
@@ -215,7 +221,7 @@
"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" : "Отменить",
+ "Cancel" : "Отмена",
"Choose as profile image" : "Установить как аватар",
"Language" : "Язык",
"Help translate" : "Помочь с переводом",
@@ -224,15 +230,15 @@
"Issued By" : "Выдан",
"Valid until %s" : "Действительно до %s",
"Import Root Certificate" : "Импортировать корневые сертификаты",
- "The encryption app is no longer enabled, please decrypt all your files" : "Приложение шифрования выключено, расшифруйте все ваши файлы",
+ "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." : "Ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+ "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" : "Удалить Ключи Шифрования",
"Show storage location" : "Показать местонахождение хранилища",
"Show last log in" : "Показать последний вход в систему",
- "Show user backend" : "Показать пользовательский бэкенд",
+ "Show user backend" : "Показать пользовательскую часть",
"Send email to new user" : "Отправлять сообщение на email новому пользователю",
"Show email address" : "Показывать адрес email",
"Username" : "Имя пользователя",
@@ -240,19 +246,19 @@
"Create" : "Создать",
"Admin Recovery Password" : "Восстановление пароля администратора",
"Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
- "Search Users" : "Искать пользователей",
+ "Search Users" : "Поиск пользователей",
"Add Group" : "Добавить группу",
"Group" : "Группа",
"Everyone" : "Все",
"Admins" : "Администраторы",
"Default Quota" : "Квота по умолчанию",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
- "Unlimited" : "Неограниченно",
- "Other" : "Другое",
+ "Unlimited" : "Неограничено",
+ "Other" : "Другая",
"Group Admin for" : "Для группы Администраторов",
"Quota" : "Квота",
"Storage Location" : "Место хранилища",
- "User Backend" : "Пользовательский бэкенд",
+ "User Backend" : "Пользовательская часть",
"Last Login" : "Последний вход",
"change full name" : "изменить полное имя",
"set new password" : "установить новый пароль",
diff --git a/settings/l10n/si_LK.js b/settings/l10n/si_LK.js
index 619fbb88051..44e1168dec1 100644
--- a/settings/l10n/si_LK.js
+++ b/settings/l10n/si_LK.js
@@ -9,6 +9,7 @@ OC.L10N.register(
"Unable to add user to group %s" : "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
"Unable to remove user from group %s" : "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
"Email saved" : "වි-තැපෑල සුරකින ලදී",
+ "All" : "සියල්ල",
"Disable" : "අක්‍රිය කරන්න",
"Enable" : "සක්‍රිය කරන්න",
"Delete" : "මකා දමන්න",
diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json
index 3977e75e3d2..6ec5deb5a1f 100644
--- a/settings/l10n/si_LK.json
+++ b/settings/l10n/si_LK.json
@@ -7,6 +7,7 @@
"Unable to add user to group %s" : "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
"Unable to remove user from group %s" : "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
"Email saved" : "වි-තැපෑල සුරකින ලදී",
+ "All" : "සියල්ල",
"Disable" : "අක්‍රිය කරන්න",
"Enable" : "සක්‍රිය කරන්න",
"Delete" : "මකා දමන්න",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 471a643f4a5..e320a3bd632 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -33,12 +33,23 @@ OC.L10N.register(
"Enabled" : "Povolené",
"Not enabled" : "Zakázané",
"Recommended" : "Odporúčané",
+ "Group already exists." : "Skupina už existuje.",
+ "Unable to add group." : "Nie je možné pridať skupinu.",
+ "Unable to delete group." : "Nie je možné zmazať skupinu.",
+ "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia",
"Saved" : "Uložené",
"test email settings" : "nastavenia testovacieho emailu",
"If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
"A problem occurred while sending the email. Please revise your settings." : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia.",
"Email sent" : "Email odoslaný",
"You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
+ "Invalid mail address" : "Neplatná emailová adresa",
+ "Unable to create user." : "Nie je možné vytvoriť používateľa.",
+ "Your %s account was created" : "Váš účet %s bol vytvorený",
+ "Unable to delete user." : "Nie je možné zmazať používateľa.",
+ "Forbidden" : "Zakázané",
+ "Invalid user" : "Neplatný používateľ",
+ "Unable to change mail address" : "Nemožno zmeniť emailovú adresu",
"Email saved" : "Email uložený",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
"Add trusted domain" : "Pridať dôveryhodnú doménu",
@@ -76,9 +87,11 @@ OC.L10N.register(
"never" : "nikdy",
"deleted {userName}" : "vymazané {userName}",
"add group" : "pridať skupinu",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Zmena hesla bude mať za následok stratu dát, pretože obnova dát nie je k dispozícii pre tohto používateľa",
"A valid username must be provided" : "Musíte zadať platné používateľské meno",
"Error creating user" : "Chyba pri vytváraní používateľa",
"A valid password must be provided" : "Musíte zadať platné heslo",
+ "A valid email must be provided" : "Musíte zadať platnú emailovú adresu",
"__language_name__" : "Slovensky",
"Personal Info" : "Osobné informácie",
"SSL root certificates" : "Koreňové SSL certifikáty",
@@ -96,11 +109,14 @@ OC.L10N.register(
"TLS" : "TLS",
"Security Warning" : "Bezpečnostné upozornenie",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.",
+ "Read-Only config enabled" : "Konfigurácia len na čítanie",
+ "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfigurácia je nastavená len na čítanie. Toto znemožňuje urobiť niektoré nastavenia prostredníctvom webového rozhrania. Okrem toho, súbor musí byť zapisovanie ručne povolené pre každú aktualizáciu.",
"Setup Warning" : "Nastavenia oznámení a upozornení",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
"Database Performance Info" : "Informácie o výkone databázy",
- "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'" : "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
+ "Microsoft Windows Platform" : "Platforma Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server je spustený s Microsoft Windows. Pre optimálne používanie odporúčame Linux.",
"Module 'fileinfo' missing" : "Chýba modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
"PHP charset is not set to UTF-8" : "Znaková sada PHP nie je nastavená na UTF-8",
@@ -108,7 +124,10 @@ OC.L10N.register(
"Locale not working" : "Lokalizácia nefunguje",
"System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
"This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
"URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwrite.cli.url\" (Doporučujeme: \"%s\")",
+ "Configuration Checks" : "Overenie konfigurácie",
"No problems found" : "Nenašli sa žiadne problémy",
"Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
"Last cron was executed at %s." : "Posledný cron bol spustený %s.",
@@ -128,10 +147,13 @@ OC.L10N.register(
"Enforce expiration date" : "Vynútiť dátum expirácie",
"Allow resharing" : "Povoliť zdieľanie ďalej",
"Restrict users to only share with users in their groups" : "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
+ "Allow users to send mail notification for shared files to other users" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov ostatným používateľom",
"Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
"These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
"Enforce HTTPS" : "Vynútiť HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
+ "Enforce HTTPS for subdomains" : "Vynútiť HTTPS pre subdomény",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynúti pripájanie klientov k %s a subdoménam šifrovaným pripojením.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
"This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
"Send mode" : "Mód odosielania",
@@ -148,8 +170,10 @@ OC.L10N.register(
"Test email settings" : "Nastavenia testovacieho emailu",
"Send email" : "Odoslať email",
"Log level" : "Úroveň záznamu",
+ "Download logfile" : "Stiahnuť súbor logu",
"More" : "Viac",
"Less" : "Menej",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Súbor logu je väčší ako 100MB. Jeho sťahovanie bude chvíľu trvať!",
"Version" : "Verzia",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Viac aplikácií",
@@ -159,16 +183,20 @@ OC.L10N.register(
"Documentation:" : "Dokumentácia:",
"User Documentation" : "Príručka používateľa",
"Admin Documentation" : "Príručka administrátora",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:",
"Update to %s" : "Aktualizovať na %s",
"Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
"Uninstall App" : "Odinštalovanie aplikácie",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Pekný deň!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámenie o novo vytvorenom účte %s.\n\nVaše používateľské meno: %s\nPrihlásiť sa môžete tu: %s\n\n",
"Administrator Documentation" : "Príručka administrátora",
"Online Documentation" : "Online príručka",
"Forum" : "Fórum",
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Komerčná podpora",
"Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
+ "Desktop client" : "Desktopový klient",
"Android app" : "Android aplikácia",
"iOS app" : "iOS aplikácia",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
@@ -181,9 +209,11 @@ OC.L10N.register(
"New password" : "Nové heslo",
"Change password" : "Zmeniť heslo",
"Full Name" : "Meno a priezvisko",
+ "No display name set" : "Zobrazované meno nie je nastavené",
"Email" : "Email",
"Your email address" : "Vaša emailová adresa",
"Fill in an email address to enable password recovery and receive notifications" : "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
+ "No email address set" : "Emailová adresa nie je nastavená",
"Profile picture" : "Avatar",
"Upload new" : "Nahrať nový",
"Select new from Files" : "Vyberte nový zo súborov",
@@ -207,7 +237,11 @@ OC.L10N.register(
"Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
"Show storage location" : "Zobraziť umiestnenie úložiska",
"Show last log in" : "Zobraziť posledné prihlásenie",
+ "Show user backend" : "Zobraziť backend používateľa",
+ "Send email to new user" : "Odoslať email novému používateľovi",
+ "Show email address" : "Zobraziť emailovú adresu",
"Username" : "Používateľské meno",
+ "E-Mail" : "email",
"Create" : "Vytvoriť",
"Admin Recovery Password" : "Obnovenie hesla administrátora",
"Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
@@ -223,9 +257,11 @@ OC.L10N.register(
"Group Admin for" : "Administrátor skupiny",
"Quota" : "Kvóta",
"Storage Location" : "Umiestnenie úložiska",
+ "User Backend" : "Backend používateľa",
"Last Login" : "Posledné prihlásenie",
"change full name" : "zmeniť meno a priezvisko",
"set new password" : "nastaviť nové heslo",
+ "change email address" : "zmeniť emailovú adresu",
"Default" : "Predvolené"
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index d6fd78b4aaa..24ffec558d2 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -31,12 +31,23 @@
"Enabled" : "Povolené",
"Not enabled" : "Zakázané",
"Recommended" : "Odporúčané",
+ "Group already exists." : "Skupina už existuje.",
+ "Unable to add group." : "Nie je možné pridať skupinu.",
+ "Unable to delete group." : "Nie je možné zmazať skupinu.",
+ "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia",
"Saved" : "Uložené",
"test email settings" : "nastavenia testovacieho emailu",
"If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
"A problem occurred while sending the email. Please revise your settings." : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia.",
"Email sent" : "Email odoslaný",
"You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
+ "Invalid mail address" : "Neplatná emailová adresa",
+ "Unable to create user." : "Nie je možné vytvoriť používateľa.",
+ "Your %s account was created" : "Váš účet %s bol vytvorený",
+ "Unable to delete user." : "Nie je možné zmazať používateľa.",
+ "Forbidden" : "Zakázané",
+ "Invalid user" : "Neplatný používateľ",
+ "Unable to change mail address" : "Nemožno zmeniť emailovú adresu",
"Email saved" : "Email uložený",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
"Add trusted domain" : "Pridať dôveryhodnú doménu",
@@ -74,9 +85,11 @@
"never" : "nikdy",
"deleted {userName}" : "vymazané {userName}",
"add group" : "pridať skupinu",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Zmena hesla bude mať za následok stratu dát, pretože obnova dát nie je k dispozícii pre tohto používateľa",
"A valid username must be provided" : "Musíte zadať platné používateľské meno",
"Error creating user" : "Chyba pri vytváraní používateľa",
"A valid password must be provided" : "Musíte zadať platné heslo",
+ "A valid email must be provided" : "Musíte zadať platnú emailovú adresu",
"__language_name__" : "Slovensky",
"Personal Info" : "Osobné informácie",
"SSL root certificates" : "Koreňové SSL certifikáty",
@@ -94,11 +107,14 @@
"TLS" : "TLS",
"Security Warning" : "Bezpečnostné upozornenie",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.",
+ "Read-Only config enabled" : "Konfigurácia len na čítanie",
+ "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfigurácia je nastavená len na čítanie. Toto znemožňuje urobiť niektoré nastavenia prostredníctvom webového rozhrania. Okrem toho, súbor musí byť zapisovanie ručne povolené pre každú aktualizáciu.",
"Setup Warning" : "Nastavenia oznámení a upozornení",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
"Database Performance Info" : "Informácie o výkone databázy",
- "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'" : "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
+ "Microsoft Windows Platform" : "Platforma Microsoft Windows",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server je spustený s Microsoft Windows. Pre optimálne používanie odporúčame Linux.",
"Module 'fileinfo' missing" : "Chýba modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
"PHP charset is not set to UTF-8" : "Znaková sada PHP nie je nastavená na UTF-8",
@@ -106,7 +122,10 @@
"Locale not working" : "Lokalizácia nefunguje",
"System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
"This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
"URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
+ "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwrite.cli.url\" (Doporučujeme: \"%s\")",
+ "Configuration Checks" : "Overenie konfigurácie",
"No problems found" : "Nenašli sa žiadne problémy",
"Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
"Last cron was executed at %s." : "Posledný cron bol spustený %s.",
@@ -126,10 +145,13 @@
"Enforce expiration date" : "Vynútiť dátum expirácie",
"Allow resharing" : "Povoliť zdieľanie ďalej",
"Restrict users to only share with users in their groups" : "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
+ "Allow users to send mail notification for shared files to other users" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov ostatným používateľom",
"Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
"These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
"Enforce HTTPS" : "Vynútiť HTTPS",
"Forces the clients to connect to %s via an encrypted connection." : "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
+ "Enforce HTTPS for subdomains" : "Vynútiť HTTPS pre subdomény",
+ "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynúti pripájanie klientov k %s a subdoménam šifrovaným pripojením.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
"This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
"Send mode" : "Mód odosielania",
@@ -146,8 +168,10 @@
"Test email settings" : "Nastavenia testovacieho emailu",
"Send email" : "Odoslať email",
"Log level" : "Úroveň záznamu",
+ "Download logfile" : "Stiahnuť súbor logu",
"More" : "Viac",
"Less" : "Menej",
+ "The logfile is bigger than 100MB. Downloading it may take some time!" : "Súbor logu je väčší ako 100MB. Jeho sťahovanie bude chvíľu trvať!",
"Version" : "Verzia",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"More apps" : "Viac aplikácií",
@@ -157,16 +181,20 @@
"Documentation:" : "Dokumentácia:",
"User Documentation" : "Príručka používateľa",
"Admin Documentation" : "Príručka administrátora",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:",
"Update to %s" : "Aktualizovať na %s",
"Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
"Uninstall App" : "Odinštalovanie aplikácie",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Pekný deň!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámenie o novo vytvorenom účte %s.\n\nVaše používateľské meno: %s\nPrihlásiť sa môžete tu: %s\n\n",
"Administrator Documentation" : "Príručka administrátora",
"Online Documentation" : "Online príručka",
"Forum" : "Fórum",
"Bugtracker" : "Bugtracker",
"Commercial Support" : "Komerčná podpora",
"Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
+ "Desktop client" : "Desktopový klient",
"Android app" : "Android aplikácia",
"iOS app" : "iOS aplikácia",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
@@ -179,9 +207,11 @@
"New password" : "Nové heslo",
"Change password" : "Zmeniť heslo",
"Full Name" : "Meno a priezvisko",
+ "No display name set" : "Zobrazované meno nie je nastavené",
"Email" : "Email",
"Your email address" : "Vaša emailová adresa",
"Fill in an email address to enable password recovery and receive notifications" : "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
+ "No email address set" : "Emailová adresa nie je nastavená",
"Profile picture" : "Avatar",
"Upload new" : "Nahrať nový",
"Select new from Files" : "Vyberte nový zo súborov",
@@ -205,7 +235,11 @@
"Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
"Show storage location" : "Zobraziť umiestnenie úložiska",
"Show last log in" : "Zobraziť posledné prihlásenie",
+ "Show user backend" : "Zobraziť backend používateľa",
+ "Send email to new user" : "Odoslať email novému používateľovi",
+ "Show email address" : "Zobraziť emailovú adresu",
"Username" : "Používateľské meno",
+ "E-Mail" : "email",
"Create" : "Vytvoriť",
"Admin Recovery Password" : "Obnovenie hesla administrátora",
"Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
@@ -221,9 +255,11 @@
"Group Admin for" : "Administrátor skupiny",
"Quota" : "Kvóta",
"Storage Location" : "Umiestnenie úložiska",
+ "User Backend" : "Backend používateľa",
"Last Login" : "Posledné prihlásenie",
"change full name" : "zmeniť meno a priezvisko",
"set new password" : "nastaviť nové heslo",
+ "change email address" : "zmeniť emailovú adresu",
"Default" : "Predvolené"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
} \ No newline at end of file
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 19211bf2e62..66b17fd6fb5 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -114,7 +114,7 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.",
"Database Performance Info" : "Databasprestanda Information",
- "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 används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows-platform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server använder Microsoft Windows. Vi rekommenderar starkt Linux för en optimal användarerfarenhet.",
"Module 'fileinfo' missing" : "Modulen \"fileinfo\" saknas",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
@@ -208,6 +208,7 @@ OC.L10N.register(
"New password" : "Nytt lösenord",
"Change password" : "Ändra lösenord",
"Full Name" : "Hela namnet",
+ "No display name set" : "Inget visningsnamn angivet",
"Email" : "E-post",
"Your email address" : "Din e-postadress",
"Fill in an email address to enable password recovery and receive notifications" : "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 8d5d00a172e..e7ad686aaf7 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -112,7 +112,7 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.",
"Database Performance Info" : "Databasprestanda Information",
- "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 används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows-platform",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server använder Microsoft Windows. Vi rekommenderar starkt Linux för en optimal användarerfarenhet.",
"Module 'fileinfo' missing" : "Modulen \"fileinfo\" saknas",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
@@ -206,6 +206,7 @@
"New password" : "Nytt lösenord",
"Change password" : "Ändra lösenord",
"Full Name" : "Hela namnet",
+ "No display name set" : "Inget visningsnamn angivet",
"Email" : "E-post",
"Your email address" : "Din e-postadress",
"Fill in an email address to enable password recovery and receive notifications" : "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 9c0d78265e1..60ed7d4d385 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -87,6 +87,7 @@ OC.L10N.register(
"never" : "hiçbir zaman",
"deleted {userName}" : "{userName} silindi",
"add group" : "grup ekle",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Parolayı değiştirmek, bu kullanıcı için veri kurtarması kullanılamadığından veri kaybına sebep olacak",
"A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
"Error creating user" : "Kullanıcı oluşturulurken hata",
"A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
@@ -114,7 +115,10 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
"Database Performance Info" : "Veritabanı Başarım Bilgisi",
- "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'" : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanıldı. Daha büyük kurulumlar için farklı bir veritabanına geçmenizi öneriyoruz.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Başka bir veritabanına eşitlemek için komut satırı aracını kullanın: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows Platformu",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.",
"Module 'fileinfo' missing" : "Modül 'fileinfo' kayıp",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
"PHP charset is not set to UTF-8" : "PHP karakter kümesi UTF-8 olarak ayarlı değil",
@@ -176,7 +180,7 @@ OC.L10N.register(
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
"More apps" : "Daha fazla uygulama",
"Add your app" : "Uygulamanızı ekleyin",
- "by" : "oluşturan",
+ "by" : "Yazan:",
"licensed" : "lisanslı",
"Documentation:" : "Belgelendirme:",
"User Documentation" : "Kullanıcı Belgelendirmesi",
@@ -207,9 +211,11 @@ OC.L10N.register(
"New password" : "Yeni parola",
"Change password" : "Parola değiştir",
"Full Name" : "Tam Adı",
+ "No display name set" : "Ekran adı ayarlanmamış",
"Email" : "E-posta",
"Your email address" : "E-posta adresiniz",
"Fill in an email address to enable password recovery and receive notifications" : "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
+ "No email address set" : "E-posta adresi ayarlanmamış",
"Profile picture" : "Profil resmi",
"Upload new" : "Yeni yükle",
"Select new from Files" : "Dosyalardan seç",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index fe1d7871fe2..4c50b86d2eb 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -85,6 +85,7 @@
"never" : "hiçbir zaman",
"deleted {userName}" : "{userName} silindi",
"add group" : "grup ekle",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Parolayı değiştirmek, bu kullanıcı için veri kurtarması kullanılamadığından veri kaybına sebep olacak",
"A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
"Error creating user" : "Kullanıcı oluşturulurken hata",
"A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
@@ -112,7 +113,10 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
"Database Performance Info" : "Veritabanı Başarım Bilgisi",
- "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'" : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanıldı. Daha büyük kurulumlar için farklı bir veritabanına geçmenizi öneriyoruz.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type'" : "Başka bir veritabanına eşitlemek için komut satırı aracını kullanın: 'occ db:convert-type'",
+ "Microsoft Windows Platform" : "Microsoft Windows Platformu",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.",
"Module 'fileinfo' missing" : "Modül 'fileinfo' kayıp",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
"PHP charset is not set to UTF-8" : "PHP karakter kümesi UTF-8 olarak ayarlı değil",
@@ -174,7 +178,7 @@
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
"More apps" : "Daha fazla uygulama",
"Add your app" : "Uygulamanızı ekleyin",
- "by" : "oluşturan",
+ "by" : "Yazan:",
"licensed" : "lisanslı",
"Documentation:" : "Belgelendirme:",
"User Documentation" : "Kullanıcı Belgelendirmesi",
@@ -205,9 +209,11 @@
"New password" : "Yeni parola",
"Change password" : "Parola değiştir",
"Full Name" : "Tam Adı",
+ "No display name set" : "Ekran adı ayarlanmamış",
"Email" : "E-posta",
"Your email address" : "E-posta adresiniz",
"Fill in an email address to enable password recovery and receive notifications" : "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
+ "No email address set" : "E-posta adresi ayarlanmamış",
"Profile picture" : "Profil resmi",
"Upload new" : "Yeni yükle",
"Select new from Files" : "Dosyalardan seç",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index eab0685320e..f4eb63c3f93 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -114,7 +114,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
"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. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-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-типів.",
"PHP charset is not set to UTF-8" : "Кодування PHP не співпадає з UTF-8",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 964d2e16bca..aae730eefcf 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -112,7 +112,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.",
"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. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-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-типів.",
"PHP charset is not set to UTF-8" : "Кодування PHP не співпадає з UTF-8",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 23c3d927474..2f894e2fad8 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -94,7 +94,6 @@ OC.L10N.register(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块,这将导致数个核心应用无法访问。",
"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 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具:“occ db:convert-type”迁移数据库",
"Module 'fileinfo' missing" : "模块'文件信息'丢失",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
"PHP charset is not set to UTF-8" : "PHP字符集没有设置为UTF-8",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 0f870b0b624..d7b87f8703c 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -92,7 +92,6 @@
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块,这将导致数个核心应用无法访问。",
"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 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具:“occ db:convert-type”迁移数据库",
"Module 'fileinfo' missing" : "模块'文件信息'丢失",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
"PHP charset is not set to UTF-8" : "PHP字符集没有设置为UTF-8",
diff --git a/settings/middleware/subadminmiddleware.php b/settings/middleware/subadminmiddleware.php
index a5c005e3148..52b77cd7e4f 100644
--- a/settings/middleware/subadminmiddleware.php
+++ b/settings/middleware/subadminmiddleware.php
@@ -59,7 +59,9 @@ class SubadminMiddleware extends Middleware {
* @return TemplateResponse
*/
public function afterException($controller, $methodName, \Exception $exception) {
- return new TemplateResponse('core', '403', array(), 'guest');
+ $response = new TemplateResponse('core', '403', array(), 'guest');
+ $response->setStatus(Http::STATUS_FORBIDDEN);
+ return $response;
}
}
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 65c6359e509..fb4662b5476 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -114,8 +114,18 @@ if ($_['databaseOverload']) {
<div class="section">
<h2><?php p($l->t('Database Performance Info'));?></h2>
- <p class="securitywarning">
- <?php p($l->t('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\'')); ?>
+ <p>
+ <strong>
+ <?php p($l->t('SQLite is used as database. For larger installations we recommend to switch to a different database backend.')); ?>
+ </strong>
+ </p>
+ <p>
+ <strong>
+ <?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?>
+ </strong>
+ </p>
+ <p>
+ <?php p($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?>
</p>
</div>
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
index 2ed7692a32f..b03cbd7c42f 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -29,6 +29,12 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
->disableOriginalConstructor()->getMock();
$this->container['L10N'] = $this->getMockBuilder('\OCP\IL10N')
->disableOriginalConstructor()->getMock();
+ $this->container['L10N']
+ ->expects($this->any())
+ ->method('t')
+ ->will($this->returnCallback(function($text, $parameters = array()) {
+ return vsprintf($text, $parameters);
+ }));
$this->container['Defaults'] = $this->getMockBuilder('\OC_Defaults')
->disableOriginalConstructor()->getMock();
$this->container['UserManager'] = $this->getMockBuilder('\OCP\IUserManager')
@@ -73,21 +79,13 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
array(true, $existingUser),
array(false, $nonExistingUser)
)));
- $this->container['L10N']
- ->expects($this->any())
- ->method('t')
- ->will(
- $this->returnValueMap(
- array(
- array('Couldn\'t send reset email. Please make sure your username is correct.', array(),
- 'Couldn\'t send reset email. Please make sure your username is correct.'),
-
- )
- ));
// With a non existing user
$response = $this->lostController->email($nonExistingUser);
- $expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.');
+ $expectedResponse = [
+ 'status' => 'error',
+ 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'
+ ];
$this->assertSame($expectedResponse, $response);
// With no mail address
@@ -97,7 +95,10 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
->with($existingUser, 'settings', 'email')
->will($this->returnValue(null));
$response = $this->lostController->email($existingUser);
- $expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.');
+ $expectedResponse = [
+ 'status' => 'error',
+ 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'
+ ];
$this->assertSame($expectedResponse, $response);
}
@@ -146,31 +147,24 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
}
public function testSetPasswordUnsuccessful() {
- $this->container['L10N']
- ->expects($this->any())
- ->method('t')
- ->will(
- $this->returnValueMap(
- array(
- array('Couldn\'t reset password because the token is invalid', array(),
- 'Couldn\'t reset password because the token is invalid'),
- )
- ));
$this->container['Config']
->expects($this->once())
->method('getUserValue')
- ->with('InvalidTokenUser', 'owncloud', 'lostpassword')
+ ->with('InvalidTokenUser', 'owncloud', 'lostpassword', null)
->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
// With an invalid token
$userName = 'InvalidTokenUser';
$response = $this->lostController->setPassword('wrongToken', $userName, 'NewPassword', true);
- $expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t reset password because the token is invalid');
+ $expectedResponse = [
+ 'status' => 'error',
+ 'msg' => 'Couldn\'t reset password because the token is invalid'
+ ];
$this->assertSame($expectedResponse, $response);
// With a valid token and no proceed
$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword!', $userName, 'NewPassword', false);
- $expectedResponse = array('status' => 'error', 'msg' => '', 'encryption' => true);
+ $expectedResponse = ['status' => 'error', 'msg' => '', 'encryption' => true];
$this->assertSame($expectedResponse, $response);
}
@@ -178,7 +172,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
$this->container['Config']
->expects($this->once())
->method('getUserValue')
- ->with('ValidTokenUser', 'owncloud', 'lostpassword')
+ ->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
$user = $this->getMockBuilder('\OCP\IUser')
->disableOriginalConstructor()->getMock();
@@ -200,4 +194,20 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
$expectedResponse = array('status' => 'success');
$this->assertSame($expectedResponse, $response);
}
+
+ public function testIsSetPasswordWithoutTokenFailing() {
+ $this->container['Config']
+ ->expects($this->once())
+ ->method('getUserValue')
+ ->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
+ ->will($this->returnValue(null));
+
+ $response = $this->lostController->setPassword('', 'ValidTokenUser', 'NewPassword', true);
+ $expectedResponse = [
+ 'status' => 'error',
+ 'msg' => 'Couldn\'t reset password because the token is invalid'
+ ];
+ $this->assertSame($expectedResponse, $response);
+ }
+
}
diff --git a/tests/lib/config.php b/tests/lib/config.php
index 6adba356a1c..91154579ab5 100644
--- a/tests/lib/config.php
+++ b/tests/lib/config.php
@@ -71,6 +71,36 @@ class Test_Config extends \Test\TestCase {
$this->assertEquals($expected, $content);
}
+ public function testSetValues() {
+ $content = file_get_contents($this->configFile);
+ $this->assertEquals(self::TESTCONTENT, $content);
+
+ // Changing configs to existing values and deleting non-existing once
+ // should not rewrite the config.php
+ $this->config->setValues([
+ 'foo' => 'bar',
+ 'not_exists' => null,
+ ]);
+
+ $this->assertAttributeEquals($this->initialConfig, 'cache', $this->config);
+ $content = file_get_contents($this->configFile);
+ $this->assertEquals(self::TESTCONTENT, $content);
+
+ $this->config->setValues([
+ 'foo' => 'moo',
+ 'alcohol_free' => null,
+ ]);
+ $expectedConfig = $this->initialConfig;
+ $expectedConfig['foo'] = 'moo';
+ unset($expectedConfig['alcohol_free']);
+ $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+
+ $content = file_get_contents($this->configFile);
+ $expected = "<?php\n\$CONFIG = array (\n 'foo' => 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
+ " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n);\n";
+ $this->assertEquals($expected, $content);
+ }
+
public function testDeleteKey() {
$this->config->deleteKey('foo');
$expectedConfig = $this->initialConfig;
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index 6bb1b4e75d1..33dc78f87d8 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -32,6 +32,31 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
$file->put('test data');
}
+ public function testPutSingleFileShare() {
+ // setup
+ $storage = $this->getMock('\OCP\Files\Storage');
+ $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array());
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('')
+ ->will($this->returnValue(array($storage, '')));
+ $view->expects($this->any())
+ ->method('getRelativePath')
+ ->will($this->returnValue(''));
+ $view->expects($this->any())
+ ->method('file_put_contents')
+ ->with('')
+ ->will($this->returnValue(true));
+
+ $info = new \OC\Files\FileInfo('/foo.txt', null, null, array(
+ 'permissions' => \OCP\Constants::PERMISSION_ALL
+ ), null);
+
+ $file = new OC_Connector_Sabre_File($view, $info);
+
+ $this->assertNotEmpty($file->put('test data'));
+ }
+
/**
* @expectedException \Sabre\DAV\Exception
*/
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 888690adb0e..7bf59315d77 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -187,6 +187,28 @@ class Filesystem extends \Test\TestCase {
$this->assertSame($expected, \OC\Files\Filesystem::isValidPath($path));
}
+ public function isFileBlacklistedData() {
+ return array(
+ array('/etc/foo/bar/foo.txt', false),
+ array('\etc\foo/bar\foo.txt', false),
+ array('.htaccess', true),
+ array('.htaccess/', true),
+ array('.htaccess\\', true),
+ array('/etc/foo\bar/.htaccess\\', true),
+ array('/etc/foo\bar/.htaccess/', true),
+ array('/etc/foo\bar/.htaccess/foo', false),
+ array('//foo//bar/\.htaccess/', true),
+ array('\foo\bar\.HTAccess', true),
+ );
+ }
+
+ /**
+ * @dataProvider isFileBlacklistedData
+ */
+ public function testIsFileBlacklisted($path, $expected) {
+ $this->assertSame($expected, \OC\Files\Filesystem::isFileBlacklisted($path));
+ }
+
public function normalizePathWindowsAbsolutePathData() {
return array(
array('C:/', 'C:\\'),
diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php
index 18161734b60..cd35d4f8fc3 100644
--- a/tests/lib/files/mapper.php
+++ b/tests/lib/files/mapper.php
@@ -68,6 +68,15 @@ class Mapper extends \Test\TestCase {
*/
array('D:/' . md5('ありがとう'), 'D:/ありがとう'),
array('D:/' . md5('ありがとう') . '/issue6722.txt', 'D:/ありがとう/issue6722.txt'),
+ array('D:/' . md5('.htaccess'), 'D:/.htaccess'),
+ array('D:/' . md5('.htaccess.'), 'D:/.htaccess.'),
+ array('D:/' . md5('.htAccess'), 'D:/.htAccess'),
+ array('D:/' . md5('.htAccess\\…\\') . '/a', 'D:/.htAccess\…\/とa'),
+ array('D:/' . md5('.htaccess-'), 'D:/.htaccess-'),
+ array('D:/' . md5('.htaあccess'), 'D:/.htaあccess'),
+ array('D:/' . md5(' .htaccess'), 'D:/ .htaccess'),
+ array('D:/' . md5('.htaccess '), 'D:/.htaccess '),
+ array('D:/' . md5(' .htaccess '), 'D:/ .htaccess '),
);
}
diff --git a/tests/lib/files/mount/mountpoint.php b/tests/lib/files/mount/mountpoint.php
new file mode 100644
index 00000000000..5a9c6de3e0a
--- /dev/null
+++ b/tests/lib/files/mount/mountpoint.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Mount;
+
+class MountPoint extends \Test\TestCase {
+
+ public function testGetStorage() {
+ $storage = $this->getMock('\OCP\Files\Storage');
+ $storage->expects($this->once())
+ ->method('getId')
+ ->will($this->returnValue(123));
+
+ $loader = $this->getMock('\OCP\Files\Storage\IStorageFactory');
+ $loader->expects($this->once())
+ ->method('getInstance')
+ ->will($this->returnValue($storage));
+
+ $mountPoint = new \OC\Files\Mount\MountPoint(
+ // just use this because a real class is needed
+ '\Test\Files\Mount\MountPoint',
+ '/mountpoint',
+ null,
+ $loader
+ );
+
+ $this->assertEquals($storage, $mountPoint->getStorage());
+ $this->assertEquals(123, $mountPoint->getStorageId());
+ }
+
+ public function testInvalidStorage() {
+ $loader = $this->getMock('\OCP\Files\Storage\IStorageFactory');
+ $loader->expects($this->once())
+ ->method('getInstance')
+ ->will($this->throwException(new \Exception('Test storage init exception')));
+
+ $called = false;
+ $wrapper = function($mountPoint, $storage) use ($called) {
+ $called = true;
+ };
+
+ $mountPoint = new \OC\Files\Mount\MountPoint(
+ // just use this because a real class is needed
+ '\Test\Files\Mount\MountPoint',
+ '/mountpoint',
+ null,
+ $loader
+ );
+
+ $this->assertNull($mountPoint->getStorage());
+ // call it again to make sure the init code only ran once
+ $this->assertNull($mountPoint->getStorage());
+
+ $this->assertNull($mountPoint->getStorageId());
+
+ // wrapping doesn't fail
+ $mountPoint->wrapStorage($wrapper);
+
+ $this->assertNull($mountPoint->getStorage());
+
+ // storage wrapper never called
+ $this->assertFalse($called);
+ }
+}
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index d8c180cc844..456a4a0e287 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -80,7 +80,9 @@ class IntegrationTests extends \Test\TestCase {
$this->assertEquals('text/plain', $file->getMimeType());
$this->assertEquals('qwerty', $file->getContent());
$this->assertFalse($this->root->nodeExists('/bar.txt'));
- $file->move('/bar.txt');
+ $target = $file->move('/bar.txt');
+ $this->assertEquals($id, $target->getId());
+ $this->assertEquals($id, $file->getId());
$this->assertFalse($this->root->nodeExists('/foo.txt'));
$this->assertTrue($this->root->nodeExists('/bar.txt'));
$this->assertEquals('bar.txt', $file->getName());
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 3ff19d7385d..f6af59d52be 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -613,7 +613,7 @@ class View extends \Test\TestCase {
if (\OC_Util::runningOnWindows()) {
$this->markTestSkipped('[Windows] ');
$depth = ((260 - $tmpdirLength) / 57);
- }elseif(\OC_Util::runningOnMac()){
+ } elseif (\OC_Util::runningOnMac()) {
$depth = ((1024 - $tmpdirLength) / 57);
} else {
$depth = ((4000 - $tmpdirLength) / 57);
@@ -730,6 +730,44 @@ class View extends \Test\TestCase {
}
/**
+ * @dataProvider relativePathProvider
+ */
+ function testGetRelativePath($absolutePath, $expectedPath) {
+ $view = new \OC\Files\View('/files');
+ // simulate a external storage mount point which has a trailing slash
+ $view->chroot('/files/');
+ $this->assertEquals($expectedPath, $view->getRelativePath($absolutePath));
+ }
+
+ function relativePathProvider() {
+ return array(
+ array('/files/', '/'),
+ array('/files', '/'),
+ array('/files/0', '0'),
+ array('/files/false', 'false'),
+ array('/files/true', 'true'),
+ array('/files/test', 'test'),
+ array('/files/test/foo', 'test/foo'),
+ );
+ }
+
+ public function testFileView() {
+ $storage = new Temporary(array());
+ $scanner = $storage->getScanner();
+ $storage->file_put_contents('foo.txt', 'bar');
+ \OC\Files\Filesystem::mount($storage, array(), '/test/');
+ $scanner->scan('');
+ $view = new \OC\Files\View('/test/foo.txt');
+
+ $this->assertEquals('bar', $view->file_get_contents(''));
+ $fh = tmpfile();
+ fwrite($fh, 'foo');
+ rewind($fh);
+ $view->file_put_contents('', $fh);
+ $this->assertEquals('foo', $view->file_get_contents(''));
+ }
+
+ /**
* @dataProvider tooLongPathDataProvider
* @expectedException \OCP\Files\InvalidPathException
*/
@@ -806,4 +844,54 @@ class View extends \Test\TestCase {
array('putFileInfo', array()),
);
}
+
+ public function testRenameCrossStoragePreserveMtime() {
+ $storage1 = new Temporary(array());
+ $storage2 = new Temporary(array());
+ $scanner1 = $storage1->getScanner();
+ $scanner2 = $storage2->getScanner();
+ $storage1->mkdir('sub');
+ $storage1->mkdir('foo');
+ $storage1->file_put_contents('foo.txt', 'asd');
+ $storage1->file_put_contents('foo/bar.txt', 'asd');
+ \OC\Files\Filesystem::mount($storage1, array(), '/test/');
+ \OC\Files\Filesystem::mount($storage2, array(), '/test/sub/storage');
+
+ $view = new \OC\Files\View('');
+ $time = time() - 200;
+ $view->touch('/test/foo.txt', $time);
+ $view->touch('/test/foo', $time);
+ $view->touch('/test/foo/bar.txt', $time);
+
+ $view->rename('/test/foo.txt', '/test/sub/storage/foo.txt');
+
+ $this->assertEquals($time, $view->filemtime('/test/sub/storage/foo.txt'));
+
+ $view->rename('/test/foo', '/test/sub/storage/foo');
+
+ $this->assertEquals($time, $view->filemtime('/test/sub/storage/foo/bar.txt'));
+ }
+
+ public function testDeleteFailKeepCache() {
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage
+ */
+ $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+ ->setConstructorArgs(array(array()))
+ ->setMethods(array('unlink'))
+ ->getMock();
+ $storage->expects($this->once())
+ ->method('unlink')
+ ->will($this->returnValue(false));
+ $scanner = $storage->getScanner();
+ $cache = $storage->getCache();
+ $storage->file_put_contents('foo.txt', 'asd');
+ $scanner->scan('');
+ \OC\Files\Filesystem::mount($storage, array(), '/test/');
+
+ $view = new \OC\Files\View('/test');
+
+ $this->assertFalse($view->unlink('foo.txt'));
+ $this->assertTrue($cache->inCache('foo.txt'));
+ }
}
diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index cff6932b670..1167fe3d868 100644
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -28,9 +28,7 @@ class CertificateManagerTest extends \Test\TestCase {
\OC\Files\Filesystem::tearDown();
\OC_Util::setupFS($this->username);
- $this->user = \OC::$server->getUserManager()->get($this->username);
-
- $this->certificateManager = new CertificateManager($this->user);
+ $this->certificateManager = new CertificateManager($this->username, new \OC\Files\View());
}
protected function tearDown() {
@@ -84,7 +82,7 @@ class CertificateManagerTest extends \Test\TestCase {
}
function testGetCertificateBundle() {
- $this->assertSame($this->user->getHome().'/files_external/rootcerts.crt', $this->certificateManager->getCertificateBundle());
+ $this->assertSame('/' . $this->username . '/files_external/rootcerts.crt', $this->certificateManager->getCertificateBundle());
}
-} \ No newline at end of file
+}
diff --git a/tests/settings/controller/logsettingscontrollertest.php b/tests/settings/controller/logsettingscontrollertest.php
index e80acfa75b5..84581bf5782 100644
--- a/tests/settings/controller/logsettingscontrollertest.php
+++ b/tests/settings/controller/logsettingscontrollertest.php
@@ -10,6 +10,7 @@
namespace Test\Settings\Controller;
use \OC\Settings\Application;
+use OC\Settings\Controller\LogSettingsController;
/**
* @package OC\Settings\Controller
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index f6ebade7b17..ed33d7fbe49 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -69,26 +69,37 @@ class MailSettingsControllerTest extends \Test\TestCase {
);
*/
- $this->container['Config']
- ->expects($this->exactly(15))
- ->method('setSystemValue');
-
+ /** @var \PHPUnit_Framework_MockObject_MockObject $config */
+ $config = $this->container['Config'];
+ $config->expects($this->exactly(2))
+ ->method('setSystemValues');
/**
* FIXME: Use the following block once Jenkins uses PHPUnit >= 4.1
- */
- /*
- $this->container['Config']
- ->expects($this->exactly(3))
- ->method('deleteSystemValue')
->withConsecutive(
- array($this->equalTo('mail_smtpauth')),
- array($this->equalTo('mail_smtpname')),
- array($this->equalTo('mail_smtppassword'))
+ [[
+ 'mail_domain' => 'owncloud.com',
+ 'mail_from_address' => 'demo@owncloud.com',
+ 'mail_smtpmode' => 'smtp',
+ 'mail_smtpsecure' => 'ssl',
+ 'mail_smtphost' => 'mx.owncloud.org',
+ 'mail_smtpauthtype' => 'NTLM',
+ 'mail_smtpauth' => 1,
+ 'mail_smtpport' => '25',
+ ]],
+ [[
+ 'mail_domain' => 'owncloud.com',
+ 'mail_from_address' => 'demo@owncloud.com',
+ 'mail_smtpmode' => 'smtp',
+ 'mail_smtpsecure' => 'ssl',
+ 'mail_smtphost' => 'mx.owncloud.org',
+ 'mail_smtpauthtype' => 'NTLM',
+ 'mail_smtpauth' => null,
+ 'mail_smtpport' => '25',
+ 'mail_smtpname' => null,
+ 'mail_smtppassword' => null,
+ ]]
);
- */
- $this->container['Config']
- ->expects($this->exactly(3))
- ->method('deleteSystemValue');
+ */
// With authentication
$response = $this->container['MailSettingsController']->setMailSettings(
@@ -126,21 +137,13 @@ class MailSettingsControllerTest extends \Test\TestCase {
->method('t')
->will($this->returnValue('Saved'));
- /**
- * FIXME: Use this block once Jenkins uses PHPUnit >= 4.1
- */
- /*
$this->container['Config']
- ->expects($this->exactly(2))
- ->method('setSystemValue')
- ->withConsecutive(
- array($this->equalTo('mail_smtpname'), $this->equalTo('UsernameToStore')),
- array($this->equalTo('mail_smtppassword'), $this->equalTo('PasswordToStore'))
- );
- */
- $this->container['Config']
- ->expects($this->exactly(2))
- ->method('setSystemValue');
+ ->expects($this->once())
+ ->method('setSystemValues')
+ ->with([
+ 'mail_smtpname' => 'UsernameToStore',
+ 'mail_smtppassword' => 'PasswordToStore',
+ ]);
$response = $this->container['MailSettingsController']->storeCredentials('UsernameToStore', 'PasswordToStore');
$expectedResponse = array('data' => array('message' =>'Saved'), 'status' => 'success');
diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php
index c6506ee440b..53a42de62ab 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/settings/controller/userscontrollertest.php
@@ -1,7 +1,7 @@
<?php
/**
* @author Lukas Reschke
- * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ * @copyright 2014-2015 Lukas Reschke lukas@owncloud.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
@@ -21,9 +21,6 @@ class UsersControllerTest extends \Test\TestCase {
/** @var \OCP\AppFramework\IAppContainer */
private $container;
- /** @var UsersController */
- private $usersController;
-
protected function setUp() {
$app = new Application();
$this->container = $app->getContainer();
@@ -36,9 +33,10 @@ class UsersControllerTest extends \Test\TestCase {
->disableOriginalConstructor()->getMock();
$this->container['L10N'] = $this->getMockBuilder('\OCP\IL10N')
->disableOriginalConstructor()->getMock();
+ $this->container['SubAdminFactory'] = $this->getMockBuilder('\OC\Settings\Factory\SubAdminFactory')
+ ->disableOriginalConstructor()->getMock();
$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
- $this->container['IsAdmin'] = true;
$this->container['L10N']
->expects($this->any())
->method('t')
@@ -54,16 +52,13 @@ class UsersControllerTest extends \Test\TestCase {
->disableOriginalConstructor()->getMock();
$this->container['URLGenerator'] = $this->getMockBuilder('\OCP\IURLGenerator')
->disableOriginalConstructor()->getMock();
-
- $this->usersController = $this->container['UsersController'];
-
+ $this->container['OCP\\App\\IAppManager'] = $this->getMockBuilder('OCP\\App\\IAppManager')
+ ->disableOriginalConstructor()->getMock();
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testIndex() {
+ public function testIndexAdmin() {
+ $this->container['IsAdmin'] = true;
+
$foo = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$foo
@@ -169,7 +164,8 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/foo',
'lastLogin' => 500,
'backend' => 'OC_User_Database',
- 'email' => 'foo@bar.com'
+ 'email' => 'foo@bar.com',
+ 'isRestoreDisabled' => false,
),
1 => array(
'name' => 'admin',
@@ -180,7 +176,8 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/admin',
'lastLogin' => 12,
'backend' => 'OC_User_Dummy',
- 'email' => 'admin@bar.com'
+ 'email' => 'admin@bar.com',
+ 'isRestoreDisabled' => false,
),
2 => array(
'name' => 'bar',
@@ -191,11 +188,181 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/bar',
'lastLogin' => 3999,
'backend' => 'OC_User_Dummy',
- 'email' => 'bar@dummy.com'
+ 'email' => 'bar@dummy.com',
+ 'isRestoreDisabled' => false,
),
)
);
- $response = $this->usersController->index(0, 10, 'gid', 'pattern');
+ $response = $this->container['UsersController']->index(0, 10, 'gid', 'pattern');
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testIndexSubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('getSubAdminsOfGroups')
+ ->with('username')
+ ->will($this->returnValue(['SubGroup1', 'SubGroup2']));
+
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('username'));
+ $this->container['UserSession']
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $foo = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $foo
+ ->expects($this->exactly(4))
+ ->method('getUID')
+ ->will($this->returnValue('foo'));
+ $foo
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue('M. Foo'));
+ $foo
+ ->method('getLastLogin')
+ ->will($this->returnValue(500));
+ $foo
+ ->method('getHome')
+ ->will($this->returnValue('/home/foo'));
+ $foo
+ ->expects($this->once())
+ ->method('getBackendClassName')
+ ->will($this->returnValue('OC_User_Database'));
+ $admin = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $admin
+ ->expects($this->exactly(4))
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $admin
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue('S. Admin'));
+ $admin
+ ->expects($this->once())
+ ->method('getLastLogin')
+ ->will($this->returnValue(12));
+ $admin
+ ->expects($this->once())
+ ->method('getHome')
+ ->will($this->returnValue('/home/admin'));
+ $admin
+ ->expects($this->once())
+ ->method('getBackendClassName')
+ ->will($this->returnValue('OC_User_Dummy'));
+ $bar = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $bar
+ ->expects($this->exactly(4))
+ ->method('getUID')
+ ->will($this->returnValue('bar'));
+ $bar
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue('B. Ar'));
+ $bar
+ ->method('getLastLogin')
+ ->will($this->returnValue(3999));
+ $bar
+ ->method('getHome')
+ ->will($this->returnValue('/home/bar'));
+ $bar
+ ->expects($this->once())
+ ->method('getBackendClassName')
+ ->will($this->returnValue('OC_User_Dummy'));
+
+ $this->container['GroupManager']
+ ->expects($this->at(0))
+ ->method('displayNamesInGroup')
+ ->with('SubGroup1', 'pattern')
+ ->will($this->returnValue(['foo' => 'M. Foo', 'admin' => 'S. Admin']));
+ $this->container['GroupManager']
+ ->expects($this->at(1))
+ ->method('displayNamesInGroup')
+ ->with('SubGroup2', 'pattern')
+ ->will($this->returnValue(['bar' => 'B. Ar']));
+ $this->container['GroupManager']
+ ->expects($this->exactly(3))
+ ->method('getUserGroupIds')
+ ->will($this->onConsecutiveCalls(
+ ['SubGroup2', 'SubGroup1'],
+ ['SubGroup2', 'Foo'],
+ ['admin', 'SubGroup1', 'testGroup']
+ ));
+ $this->container['UserManager']
+ ->expects($this->at(0))
+ ->method('get')
+ ->with('foo')
+ ->will($this->returnValue($foo));
+ $this->container['UserManager']
+ ->expects($this->at(1))
+ ->method('get')
+ ->with('admin')
+ ->will($this->returnValue($admin));
+ $this->container['UserManager']
+ ->expects($this->at(2))
+ ->method('get')
+ ->with('bar')
+ ->will($this->returnValue($bar));
+ $this->container['Config']
+ ->expects($this->exactly(6))
+ ->method('getUserValue')
+ ->will($this->onConsecutiveCalls(
+ 1024, 'foo@bar.com',
+ 404, 'admin@bar.com',
+ 2323, 'bar@dummy.com'
+ ));
+
+ $expectedResponse = new DataResponse(
+ [
+ 0 => [
+ 'name' => 'foo',
+ 'displayname' => 'M. Foo',
+ 'groups' => ['SubGroup2', 'SubGroup1'],
+ 'subadmin' => [],
+ 'quota' => 1024,
+ 'storageLocation' => '/home/foo',
+ 'lastLogin' => 500,
+ 'backend' => 'OC_User_Database',
+ 'email' => 'foo@bar.com',
+ 'isRestoreDisabled' => false,
+ ],
+ 1 => [
+ 'name' => 'admin',
+ 'displayname' => 'S. Admin',
+ 'groups' => ['SubGroup2'],
+ 'subadmin' => [],
+ 'quota' => 404,
+ 'storageLocation' => '/home/admin',
+ 'lastLogin' => 12,
+ 'backend' => 'OC_User_Dummy',
+ 'email' => 'admin@bar.com',
+ 'isRestoreDisabled' => false,
+ ],
+ 2 => [
+ 'name' => 'bar',
+ 'displayname' => 'B. Ar',
+ 'groups' => ['SubGroup1'],
+ 'subadmin' => [],
+ 'quota' => 2323,
+ 'storageLocation' => '/home/bar',
+ 'lastLogin' => 3999,
+ 'backend' => 'OC_User_Dummy',
+ 'email' => 'bar@dummy.com',
+ 'isRestoreDisabled' => false,
+ ],
+ ]
+ );
+
+ $response = $this->container['UsersController']->index(0, 10, '', 'pattern');
$this->assertEquals($expectedResponse, $response);
}
@@ -204,6 +371,8 @@ class UsersControllerTest extends \Test\TestCase {
* to test for subadmins. Thus the test always assumes you have admin permissions...
*/
public function testIndexWithSearch() {
+ $this->container['IsAdmin'] = true;
+
$foo = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$foo
@@ -294,7 +463,8 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/foo',
'lastLogin' => 500,
'backend' => 'OC_User_Database',
- 'email' => 'foo@bar.com'
+ 'email' => 'foo@bar.com',
+ 'isRestoreDisabled' => false,
),
1 => array(
'name' => 'admin',
@@ -305,7 +475,8 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/admin',
'lastLogin' => 12,
'backend' => 'OC_User_Dummy',
- 'email' => 'admin@bar.com'
+ 'email' => 'admin@bar.com',
+ 'isRestoreDisabled' => false,
),
2 => array(
'name' => 'bar',
@@ -316,16 +487,18 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/bar',
'lastLogin' => 3999,
'backend' => 'OC_User_Dummy',
- 'email' => 'bar@dummy.com'
+ 'email' => 'bar@dummy.com',
+ 'isRestoreDisabled' => false,
),
)
);
- $response = $this->usersController->index(0, 10, '', 'pattern');
+ $response = $this->container['UsersController']->index(0, 10, '', 'pattern');
$this->assertEquals($expectedResponse, $response);
}
-
public function testIndexWithBackend() {
+ $this->container['IsAdmin'] = true;
+
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
@@ -374,15 +547,18 @@ class UsersControllerTest extends \Test\TestCase {
'storageLocation' => '/home/foo',
'lastLogin' => 500,
'backend' => 'OC_User_Database',
- 'email' => null
+ 'email' => null,
+ 'isRestoreDisabled' => false,
)
)
);
- $response = $this->usersController->index(0, 10, '','', 'OC_User_Dummy');
+ $response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
$this->assertEquals($expectedResponse, $response);
}
public function testIndexWithBackendNoUser() {
+ $this->container['IsAdmin'] = true;
+
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
@@ -394,15 +570,13 @@ class UsersControllerTest extends \Test\TestCase {
->will($this->returnValue([]));
$expectedResponse = new DataResponse([]);
- $response = $this->usersController->index(0, 10, '','', 'OC_User_Dummy');
+ $response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
$this->assertEquals($expectedResponse, $response);
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testCreateSuccessfulWithoutGroup() {
+ public function testCreateSuccessfulWithoutGroupAdmin() {
+ $this->container['IsAdmin'] = true;
+
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
@@ -432,19 +606,97 @@ class UsersControllerTest extends \Test\TestCase {
'displayname' => null,
'quota' => null,
'subadmin' => array(),
- 'email' => null
+ 'email' => null,
+ 'isRestoreDisabled' => false,
),
Http::STATUS_CREATED
);
- $response = $this->usersController->create('foo', 'password', array());
+ $response = $this->container['UsersController']->create('foo', 'password', array());
$this->assertEquals($expectedResponse, $response);
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testCreateSuccessfulWithGroup() {
+ public function testCreateSuccessfulWithoutGroupSubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('getSubAdminsOfGroups')
+ ->with('username')
+ ->will($this->returnValue(['SubGroup1', 'SubGroup2']));
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('username'));
+ $this->container['UserSession']
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->method('getHome')
+ ->will($this->returnValue('/home/user'));
+ $user
+ ->method('getHome')
+ ->will($this->returnValue('/home/user'));
+ $user
+ ->method('getUID')
+ ->will($this->returnValue('foo'));
+ $user
+ ->expects($this->once())
+ ->method('getBackendClassName')
+ ->will($this->returnValue('bar'));
+ $subGroup1 = $this->getMockBuilder('\OCP\IGroup')
+ ->disableOriginalConstructor()->getMock();
+ $subGroup1
+ ->expects($this->once())
+ ->method('addUser')
+ ->with($user);
+ $subGroup2 = $this->getMockBuilder('\OCP\IGroup')
+ ->disableOriginalConstructor()->getMock();
+ $subGroup2
+ ->expects($this->once())
+ ->method('addUser')
+ ->with($user);
+
+ $this->container['UserManager']
+ ->expects($this->once())
+ ->method('createUser')
+ ->will($this->onConsecutiveCalls($user));
+ $this->container['GroupManager']
+ ->expects($this->exactly(2))
+ ->method('get')
+ ->will($this->onConsecutiveCalls($subGroup1, $subGroup2));
+ $this->container['GroupManager']
+ ->expects($this->once())
+ ->method('getUserGroupIds')
+ ->with($user)
+ ->will($this->onConsecutiveCalls(['SubGroup1', 'SubGroup2']));
+
+ $expectedResponse = new DataResponse(
+ array(
+ 'name' => 'foo',
+ 'groups' => ['SubGroup1', 'SubGroup2'],
+ 'storageLocation' => '/home/user',
+ 'backend' => 'bar',
+ 'lastLogin' => null,
+ 'displayname' => null,
+ 'quota' => null,
+ 'subadmin' => [],
+ 'email' => null,
+ 'isRestoreDisabled' => false,
+ ),
+ Http::STATUS_CREATED
+ );
+ $response = $this->container['UsersController']->create('foo', 'password');
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testCreateSuccessfulWithGroupAdmin() {
+ $this->container['IsAdmin'] = true;
+
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
@@ -502,19 +754,97 @@ class UsersControllerTest extends \Test\TestCase {
'displayname' => null,
'quota' => null,
'subadmin' => array(),
- 'email' => null
+ 'email' => null,
+ 'isRestoreDisabled' => false,
),
Http::STATUS_CREATED
);
- $response = $this->usersController->create('foo', 'password', array('NewGroup', 'ExistingGroup'));
+ $response = $this->container['UsersController']->create('foo', 'password', array('NewGroup', 'ExistingGroup'));
$this->assertEquals($expectedResponse, $response);
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testCreateUnsuccessful() {
+ public function testCreateSuccessfulWithGroupSubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('getSubAdminsOfGroups')
+ ->with('username')
+ ->will($this->returnValue(['SubGroup1', 'SubGroup2']));
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('username'));
+ $this->container['UserSession']
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->method('getHome')
+ ->will($this->returnValue('/home/user'));
+ $user
+ ->method('getHome')
+ ->will($this->returnValue('/home/user'));
+ $user
+ ->method('getUID')
+ ->will($this->returnValue('foo'));
+ $user
+ ->expects($this->once())
+ ->method('getBackendClassName')
+ ->will($this->returnValue('bar'));
+ $subGroup1 = $this->getMockBuilder('\OCP\IGroup')
+ ->disableOriginalConstructor()->getMock();
+ $subGroup1
+ ->expects($this->once())
+ ->method('addUser')
+ ->with($user);
+ $subGroup2 = $this->getMockBuilder('\OCP\IGroup')
+ ->disableOriginalConstructor()->getMock();
+ $subGroup2
+ ->expects($this->once())
+ ->method('addUser')
+ ->with($user);
+
+ $this->container['UserManager']
+ ->expects($this->once())
+ ->method('createUser')
+ ->will($this->onConsecutiveCalls($user));
+ $this->container['GroupManager']
+ ->expects($this->exactly(2))
+ ->method('get')
+ ->will($this->onConsecutiveCalls($subGroup1, $subGroup2));
+ $this->container['GroupManager']
+ ->expects($this->once())
+ ->method('getUserGroupIds')
+ ->with($user)
+ ->will($this->onConsecutiveCalls(['SubGroup1']));
+
+ $expectedResponse = new DataResponse(
+ array(
+ 'name' => 'foo',
+ 'groups' => ['SubGroup1'],
+ 'storageLocation' => '/home/user',
+ 'backend' => 'bar',
+ 'lastLogin' => null,
+ 'displayname' => null,
+ 'quota' => null,
+ 'subadmin' => [],
+ 'email' => null,
+ 'isRestoreDisabled' => false,
+ ),
+ Http::STATUS_CREATED
+ );
+ $response = $this->container['UsersController']->create('foo', 'password', ['SubGroup1', 'ExistingGroup']);
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testCreateUnsuccessfulAdmin() {
+ $this->container['IsAdmin'] = true;
+
$this->container['UserManager']
->method('createUser')
->will($this->throwException(new \Exception()));
@@ -525,15 +855,45 @@ class UsersControllerTest extends \Test\TestCase {
),
Http::STATUS_FORBIDDEN
);
- $response = $this->usersController->create('foo', 'password', array());
+ $response = $this->container['UsersController']->create('foo', 'password', array());
$this->assertEquals($expectedResponse, $response);
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testDestroySelf() {
+ public function testCreateUnsuccessfulSubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('getSubAdminsOfGroups')
+ ->with('username')
+ ->will($this->returnValue(['SubGroup1', 'SubGroup2']));
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('username'));
+ $this->container['UserSession']
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $this->container['UserManager']
+ ->method('createUser')
+ ->will($this->throwException(new \Exception()));
+
+ $expectedResponse = new DataResponse(
+ [
+ 'message' => 'Unable to create user.'
+ ],
+ Http::STATUS_FORBIDDEN
+ );
+ $response = $this->container['UsersController']->create('foo', 'password', array());
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testDestroySelfAdmin() {
+ $this->container['IsAdmin'] = true;
+
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
@@ -553,15 +913,39 @@ class UsersControllerTest extends \Test\TestCase {
),
Http::STATUS_FORBIDDEN
);
- $response = $this->usersController->destroy('myself');
+ $response = $this->container['UsersController']->destroy('myself');
$this->assertEquals($expectedResponse, $response);
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testDestroy() {
+ public function testDestroySelfSubadmin() {
+ $this->container['IsAdmin'] = false;
+
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('myself'));
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $expectedResponse = new DataResponse(
+ array(
+ 'status' => 'error',
+ 'data' => array(
+ 'message' => 'Unable to delete user.'
+ )
+ ),
+ Http::STATUS_FORBIDDEN
+ );
+ $response = $this->container['UsersController']->destroy('myself');
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testDestroyAdmin() {
+ $this->container['IsAdmin'] = true;
+
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
@@ -591,14 +975,59 @@ class UsersControllerTest extends \Test\TestCase {
),
Http::STATUS_NO_CONTENT
);
- $response = $this->usersController->destroy('UserToDelete');
+ $response = $this->container['UsersController']->destroy('UserToDelete');
$this->assertEquals($expectedResponse, $response);
}
- /**
- * TODO: Since the function uses the static OC_Subadmin class it can't be mocked
- * to test for subadmins. Thus the test always assumes you have admin permissions...
- */
- public function testDestroyUnsuccessful() {
+
+ public function testDestroySubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with('myself', 'UserToDelete')
+ ->will($this->returnValue(true));
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('myself'));
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $toDeleteUser = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $toDeleteUser
+ ->expects($this->once())
+ ->method('delete')
+ ->will($this->returnValue(true));
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+ $this->container['UserManager']
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($toDeleteUser));
+
+ $expectedResponse = new DataResponse(
+ [
+ 'status' => 'success',
+ 'data' => [
+ 'username' => 'UserToDelete'
+ ]
+ ],
+ Http::STATUS_NO_CONTENT
+ );
+ $response = $this->container['UsersController']->destroy('UserToDelete');
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testDestroyUnsuccessfulAdmin() {
+ $this->container['IsAdmin'] = true;
+
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
@@ -628,14 +1057,100 @@ class UsersControllerTest extends \Test\TestCase {
),
Http::STATUS_FORBIDDEN
);
- $response = $this->usersController->destroy('UserToDelete');
+ $response = $this->container['UsersController']->destroy('UserToDelete');
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testDestroyUnsuccessfulSubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with('myself', 'UserToDelete')
+ ->will($this->returnValue(true));
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('myself'));
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $toDeleteUser = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $toDeleteUser
+ ->expects($this->once())
+ ->method('delete')
+ ->will($this->returnValue(false));
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+ $this->container['UserManager']
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($toDeleteUser));
+
+ $expectedResponse = new DataResponse(
+ [
+ 'status' => 'error',
+ 'data' => [
+ 'message' => 'Unable to delete user.'
+ ]
+ ],
+ Http::STATUS_FORBIDDEN
+ );
+ $response = $this->container['UsersController']->destroy('UserToDelete');
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ public function testDestroyNotAccessibleToSubAdmin() {
+ $this->container['IsAdmin'] = false;
+ $this->container['SubAdminFactory']
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with('myself', 'UserToDelete')
+ ->will($this->returnValue(false));
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('myself'));
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+
+ $toDeleteUser = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $this->container['UserSession']
+ ->method('getUser')
+ ->will($this->returnValue($user));
+ $this->container['UserManager']
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($toDeleteUser));
+
+ $expectedResponse = new DataResponse(
+ [
+ 'status' => 'error',
+ 'data' => [
+ 'message' => 'Authentication error'
+ ]
+ ],
+ Http::STATUS_FORBIDDEN
+ );
+ $response = $this->container['UsersController']->destroy('UserToDelete');
$this->assertEquals($expectedResponse, $response);
}
/**
* test if an invalid mail result in a failure response
*/
- public function testCreateUnsuccessfulWithInvalidEMail() {
+ public function testCreateUnsuccessfulWithInvalidEmailAdmin() {
+ $this->container['IsAdmin'] = true;
+
/**
* FIXME: Disabled due to missing DI on mail class.
* TODO: Re-enable when https://github.com/owncloud/core/pull/12085 is merged.
@@ -653,14 +1168,16 @@ class UsersControllerTest extends \Test\TestCase {
),
Http::STATUS_UNPROCESSABLE_ENTITY
);
- $response = $this->usersController->create('foo', 'password', array(), 'invalidMailAdress');
+ $response = $this->container['UsersController']->create('foo', 'password', array(), 'invalidMailAdress');
$this->assertEquals($expectedResponse, $response);
}
/**
* test if a valid mail result in a successful mail send
*/
- public function testCreateSuccessfulWithValidEMail() {
+ public function testCreateSuccessfulWithValidEmailAdmin() {
+ $this->container['IsAdmin'] = true;
+
/**
* FIXME: Disabled due to missing DI on mail class.
* TODO: Re-enable when https://github.com/owncloud/core/pull/12085 is merged.
@@ -688,8 +1205,150 @@ class UsersControllerTest extends \Test\TestCase {
->expects($this->never())
->method('error');
- $response = $this->usersController->create('foo', 'password', array(), 'validMail@Adre.ss');
+ $response = $this->container['UsersController']->create('foo', 'password', array(), 'validMail@Adre.ss');
$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
}
+ private function mockUser($userId = 'foo', $displayName = 'M. Foo',
+ $lastLogin = 500, $home = '/home/foo', $backend = 'OC_User_Database') {
+ $user = $this->getMockBuilder('\OC\User\User')
+ ->disableOriginalConstructor()->getMock();
+ $user
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue($userId));
+ $user
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue($displayName));
+ $user
+ ->method('getLastLogin')
+ ->will($this->returnValue($lastLogin));
+ $user
+ ->method('getHome')
+ ->will($this->returnValue($home));
+ $user
+ ->expects($this->once())
+ ->method('getBackendClassName')
+ ->will($this->returnValue($backend));
+
+ $result = [
+ 'name' => $userId,
+ 'displayname' => $displayName,
+ 'groups' => null,
+ 'subadmin' => array(),
+ 'quota' => null,
+ 'storageLocation' => $home,
+ 'lastLogin' => $lastLogin,
+ 'backend' => $backend,
+ 'email' => null,
+ 'isRestoreDisabled' => false,
+ ];
+
+ return [$user, $result];
+ }
+
+ public function testRestorePossibleWithoutEncryption() {
+ $this->container['IsAdmin'] = true;
+
+ list($user, $expectedResult) = $this->mockUser();
+
+ $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]);
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ public function testRestorePossibleWithAdminAndUserRestore() {
+ $this->container['IsAdmin'] = true;
+
+ list($user, $expectedResult) = $this->mockUser();
+
+ $this->container['OCP\\App\\IAppManager']
+ ->expects($this->once())
+ ->method('isEnabledForUser')
+ ->with(
+ $this->equalTo('files_encryption')
+ )
+ ->will($this->returnValue(true));
+ $this->container['Config']
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->with(
+ $this->equalTo('files_encryption'),
+ $this->equalTo('recoveryAdminEnabled'),
+ $this->anything()
+ )
+ ->will($this->returnValue('1'));
+
+ $this->container['Config']
+ ->expects($this->at(1))
+ ->method('getUserValue')
+ ->with(
+ $this->anything(),
+ $this->equalTo('files_encryption'),
+ $this->equalTo('recovery_enabled'),
+ $this->anything()
+ )
+ ->will($this->returnValue('1'));
+
+ $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]);
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ public function testRestoreNotPossibleWithoutAdminRestore() {
+ $this->container['IsAdmin'] = true;
+
+ list($user, $expectedResult) = $this->mockUser();
+
+ $this->container['OCP\\App\\IAppManager']
+ ->method('isEnabledForUser')
+ ->with(
+ $this->equalTo('files_encryption')
+ )
+ ->will($this->returnValue(true));
+
+ $expectedResult['isRestoreDisabled'] = true;
+
+ $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]);
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ public function testRestoreNotPossibleWithoutUserRestore() {
+ $this->container['IsAdmin'] = true;
+
+ list($user, $expectedResult) = $this->mockUser();
+
+ $this->container['OCP\\App\\IAppManager']
+ ->expects($this->once())
+ ->method('isEnabledForUser')
+ ->with(
+ $this->equalTo('files_encryption')
+ )
+ ->will($this->returnValue(true));
+ $this->container['Config']
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->with(
+ $this->equalTo('files_encryption'),
+ $this->equalTo('recoveryAdminEnabled'),
+ $this->anything()
+ )
+ ->will($this->returnValue('1'));
+
+ $this->container['Config']
+ ->expects($this->at(1))
+ ->method('getUserValue')
+ ->with(
+ $this->anything(),
+ $this->equalTo('files_encryption'),
+ $this->equalTo('recovery_enabled'),
+ $this->anything()
+ )
+ ->will($this->returnValue('0'));
+
+ $expectedResult['isRestoreDisabled'] = true;
+
+ $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]);
+ $this->assertEquals($expectedResult, $result);
+ }
+
}
diff --git a/tests/settings/middleware/subadminmiddlewaretest.php b/tests/settings/middleware/subadminmiddlewaretest.php
index e5572cfba52..d0da19f60e1 100644
--- a/tests/settings/middleware/subadminmiddlewaretest.php
+++ b/tests/settings/middleware/subadminmiddlewaretest.php
@@ -81,11 +81,9 @@ class SubadminMiddlewareTest extends \Test\TestCase {
$this->subadminMiddlewareAsSubAdmin->beforeController($this->controller, 'foo');
}
-
-
-
public function testAfterException() {
$expectedResponse = new TemplateResponse('core', '403', array(), 'guest');
+ $expectedResponse->setStatus(403);
$this->assertEquals($expectedResponse, $this->subadminMiddleware->afterException($this->controller, 'foo', new \Exception()));
}
-} \ No newline at end of file
+}
diff --git a/version.php b/version.php
index 3c0c6aa2042..e50220be11b 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(8, 0, 0, 3);
+$OC_Version=array(8, 0, 0, 7);
// The human readable string
-$OC_VersionString='8.0 beta 1';
+$OC_VersionString='8.0';
// The ownCloud channel
$OC_Channel='git';