summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--apps/files/ajax/delete.php2
-rw-r--r--apps/files/ajax/timezone.php2
-rw-r--r--apps/files/css/files.css41
-rw-r--r--apps/files/download.php7
-rw-r--r--apps/files/index.php155
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--apps/files/js/files.js24
-rw-r--r--apps/files/js/keyboardshortcuts.js3
-rw-r--r--apps/files/js/timezone.js12
-rw-r--r--apps/files/l10n/da.php4
-rw-r--r--apps/files/l10n/el.php4
-rw-r--r--apps/files/l10n/mk.php24
-rw-r--r--apps/files/l10n/ro.php15
-rw-r--r--apps/files/l10n/ru_RU.php1
-rw-r--r--apps/files/l10n/th_TH.php1
-rw-r--r--apps/files/l10n/tr.php11
-rw-r--r--apps/files/templates/admin.php6
-rw-r--r--apps/files/templates/index.php2
-rw-r--r--apps/files_encryption/l10n/he.php6
-rw-r--r--apps/files_encryption/l10n/mk.php6
-rw-r--r--apps/files_encryption/l10n/tr.php6
-rw-r--r--apps/files_encryption/settings.php4
-rw-r--r--apps/files_encryption/templates/settings.php12
-rw-r--r--apps/files_external/l10n/da.php2
-rw-r--r--apps/files_external/l10n/de.php2
-rw-r--r--apps/files_external/l10n/de_DE.php2
-rw-r--r--apps/files_external/l10n/el.php2
-rw-r--r--apps/files_external/l10n/eu.php2
-rw-r--r--apps/files_external/l10n/fr.php2
-rw-r--r--apps/files_external/l10n/mk.php23
-rw-r--r--apps/files_external/l10n/nl.php2
-rw-r--r--apps/files_external/l10n/pt_PT.php2
-rw-r--r--apps/files_external/l10n/ru_RU.php2
-rw-r--r--apps/files_external/l10n/sl.php2
-rw-r--r--apps/files_external/l10n/sv.php2
-rw-r--r--apps/files_external/l10n/tr.php13
-rw-r--r--apps/files_external/l10n/zh_CN.php2
-rwxr-xr-xapps/files_external/lib/config.php4
-rwxr-xr-xapps/files_external/personal.php2
-rw-r--r--apps/files_external/settings.php4
-rw-r--r--apps/files_external/templates/settings.php11
-rw-r--r--apps/files_sharing/l10n/ar.php9
-rw-r--r--apps/files_sharing/l10n/mk.php9
-rw-r--r--apps/files_sharing/public.php2
-rw-r--r--apps/files_versions/appinfo/app.php2
-rw-r--r--apps/files_versions/history.php4
-rw-r--r--apps/files_versions/l10n/ar.php8
-rw-r--r--apps/files_versions/l10n/mk.php8
-rw-r--r--apps/files_versions/l10n/tr.php8
-rw-r--r--apps/files_versions/templates/history.php4
-rw-r--r--apps/files_versions/templates/settings-personal.php6
-rw-r--r--apps/user_ldap/l10n/ar.php3
-rw-r--r--apps/user_ldap/l10n/ca.php2
-rw-r--r--apps/user_ldap/l10n/cs_CZ.php2
-rw-r--r--apps/user_ldap/l10n/da.php14
-rw-r--r--apps/user_ldap/l10n/de.php2
-rw-r--r--apps/user_ldap/l10n/de_DE.php2
-rw-r--r--apps/user_ldap/l10n/el.php21
-rw-r--r--apps/user_ldap/l10n/es.php2
-rw-r--r--apps/user_ldap/l10n/eu.php2
-rw-r--r--apps/user_ldap/l10n/fr.php2
-rw-r--r--apps/user_ldap/l10n/it.php2
-rw-r--r--apps/user_ldap/l10n/ja_JP.php2
-rw-r--r--apps/user_ldap/l10n/mk.php5
-rw-r--r--apps/user_ldap/l10n/nl.php2
-rw-r--r--apps/user_ldap/l10n/pl.php2
-rw-r--r--apps/user_ldap/l10n/pt_PT.php2
-rw-r--r--apps/user_ldap/l10n/ro.php2
-rw-r--r--apps/user_ldap/l10n/ru.php2
-rw-r--r--apps/user_ldap/l10n/ru_RU.php2
-rw-r--r--apps/user_ldap/l10n/sl.php2
-rw-r--r--apps/user_ldap/l10n/sv.php2
-rw-r--r--apps/user_ldap/l10n/tr.php24
-rw-r--r--apps/user_ldap/l10n/uk.php2
-rw-r--r--apps/user_ldap/lib/access.php26
-rw-r--r--apps/user_ldap/lib/connection.php8
-rw-r--r--apps/user_ldap/settings.php3
-rw-r--r--apps/user_webdavauth/l10n/ar.php2
-rw-r--r--apps/user_webdavauth/l10n/ca.php3
-rw-r--r--apps/user_webdavauth/l10n/cs_CZ.php3
-rw-r--r--apps/user_webdavauth/l10n/da.php4
-rw-r--r--apps/user_webdavauth/l10n/de.php3
-rw-r--r--apps/user_webdavauth/l10n/de_DE.php3
-rw-r--r--apps/user_webdavauth/l10n/el.php3
-rw-r--r--apps/user_webdavauth/l10n/eo.php2
-rw-r--r--apps/user_webdavauth/l10n/eu.php3
-rw-r--r--apps/user_webdavauth/l10n/it.php3
-rw-r--r--apps/user_webdavauth/l10n/ja_JP.php3
-rw-r--r--apps/user_webdavauth/l10n/mk.php3
-rw-r--r--apps/user_webdavauth/l10n/nl.php3
-rw-r--r--apps/user_webdavauth/l10n/pl.php2
-rw-r--r--apps/user_webdavauth/l10n/pt_PT.php3
-rw-r--r--apps/user_webdavauth/l10n/ro.php4
-rw-r--r--apps/user_webdavauth/l10n/ru.php2
-rw-r--r--apps/user_webdavauth/l10n/ru_RU.php2
-rw-r--r--apps/user_webdavauth/l10n/sv.php3
-rw-r--r--apps/user_webdavauth/l10n/tr.php2
-rw-r--r--apps/user_webdavauth/l10n/uk.php3
-rw-r--r--apps/user_webdavauth/l10n/zh_CN.php2
-rwxr-xr-xapps/user_webdavauth/settings.php8
-rwxr-xr-xapps/user_webdavauth/templates/settings.php3
-rw-r--r--build/README.TXT28
-rw-r--r--build/build.xml179
-rw-r--r--build/phpcs.xml80
-rw-r--r--build/phpmd.xml9
-rw-r--r--config/config.sample.php6
-rw-r--r--core/ajax/share.php6
-rw-r--r--core/css/styles.css4
-rw-r--r--core/doc/admin/index.php2
-rw-r--r--core/doc/user/index.php2
-rw-r--r--core/img/actions/logout.pngbin592 -> 706 bytes
-rw-r--r--core/img/actions/logout.svg118
-rw-r--r--core/js/share.js31
-rw-r--r--core/l10n/ar.php50
-rw-r--r--core/l10n/ca.php2
-rw-r--r--core/l10n/da.php21
-rw-r--r--core/l10n/de.php8
-rw-r--r--core/l10n/de_DE.php8
-rw-r--r--core/l10n/el.php8
-rw-r--r--core/l10n/eo.php8
-rw-r--r--core/l10n/es.php8
-rw-r--r--core/l10n/fi_FI.php4
-rw-r--r--core/l10n/fr.php8
-rw-r--r--core/l10n/he.php8
-rw-r--r--core/l10n/it.php1
-rw-r--r--core/l10n/ja_JP.php8
-rw-r--r--core/l10n/mk.php68
-rw-r--r--core/l10n/nl.php8
-rw-r--r--core/l10n/pl.php4
-rw-r--r--core/l10n/pt_PT.php8
-rw-r--r--core/l10n/ro.php21
-rw-r--r--core/l10n/ru_RU.php8
-rw-r--r--core/l10n/sl.php8
-rw-r--r--core/l10n/sv.php8
-rw-r--r--core/l10n/tr.php37
-rw-r--r--core/l10n/zh_CN.php7
-rw-r--r--core/lostpassword/controller.php2
-rw-r--r--core/templates/login.php76
-rw-r--r--core/templates/logout.php2
-rw-r--r--l10n/ar/core.po161
-rw-r--r--l10n/ar/files_sharing.po31
-rw-r--r--l10n/ar/files_versions.po23
-rw-r--r--l10n/ar/lib.po30
-rw-r--r--l10n/ar/settings.po149
-rw-r--r--l10n/ar/user_ldap.po91
-rw-r--r--l10n/ar/user_webdavauth.po18
-rw-r--r--l10n/bg_BG/settings.po100
-rw-r--r--l10n/bg_BG/user_ldap.po89
-rw-r--r--l10n/bg_BG/user_webdavauth.po15
-rw-r--r--l10n/ca/core.po64
-rw-r--r--l10n/ca/settings.po104
-rw-r--r--l10n/ca/user_ldap.po87
-rw-r--r--l10n/ca/user_webdavauth.po15
-rw-r--r--l10n/cs_CZ/settings.po102
-rw-r--r--l10n/cs_CZ/user_ldap.po85
-rw-r--r--l10n/cs_CZ/user_webdavauth.po15
-rw-r--r--l10n/da/core.po107
-rw-r--r--l10n/da/files.po87
-rw-r--r--l10n/da/files_external.po17
-rw-r--r--l10n/da/lib.po37
-rw-r--r--l10n/da/settings.po109
-rw-r--r--l10n/da/user_ldap.po117
-rw-r--r--l10n/da/user_webdavauth.po18
-rw-r--r--l10n/de/core.po82
-rw-r--r--l10n/de/files_external.po17
-rw-r--r--l10n/de/settings.po104
-rw-r--r--l10n/de/user_ldap.po87
-rw-r--r--l10n/de/user_webdavauth.po15
-rw-r--r--l10n/de_DE/core.po81
-rw-r--r--l10n/de_DE/files_external.po17
-rw-r--r--l10n/de_DE/settings.po107
-rw-r--r--l10n/de_DE/user_ldap.po86
-rw-r--r--l10n/de_DE/user_webdavauth.po19
-rw-r--r--l10n/el/core.po80
-rw-r--r--l10n/el/files.po83
-rw-r--r--l10n/el/files_external.po17
-rw-r--r--l10n/el/settings.po102
-rw-r--r--l10n/el/user_ldap.po127
-rw-r--r--l10n/el/user_webdavauth.po19
-rw-r--r--l10n/eo/core.po72
-rw-r--r--l10n/eo/settings.po104
-rw-r--r--l10n/eo/user_ldap.po87
-rw-r--r--l10n/eo/user_webdavauth.po15
-rw-r--r--l10n/es/core.po55
-rw-r--r--l10n/es/settings.po104
-rw-r--r--l10n/es/user_ldap.po88
-rw-r--r--l10n/es/user_webdavauth.po17
-rw-r--r--l10n/es_AR/settings.po104
-rw-r--r--l10n/es_AR/user_ldap.po87
-rw-r--r--l10n/es_AR/user_webdavauth.po17
-rw-r--r--l10n/et_EE/settings.po102
-rw-r--r--l10n/et_EE/user_ldap.po87
-rw-r--r--l10n/et_EE/user_webdavauth.po17
-rw-r--r--l10n/eu/files_external.po16
-rw-r--r--l10n/eu/settings.po104
-rw-r--r--l10n/eu/user_ldap.po87
-rw-r--r--l10n/eu/user_webdavauth.po15
-rw-r--r--l10n/fa/settings.po104
-rw-r--r--l10n/fa/user_ldap.po89
-rw-r--r--l10n/fa/user_webdavauth.po15
-rw-r--r--l10n/fi_FI/core.po46
-rw-r--r--l10n/fi_FI/settings.po102
-rw-r--r--l10n/fi_FI/user_ldap.po87
-rw-r--r--l10n/fi_FI/user_webdavauth.po17
-rw-r--r--l10n/fr/core.po82
-rw-r--r--l10n/fr/files_external.po17
-rw-r--r--l10n/fr/settings.po105
-rw-r--r--l10n/fr/user_ldap.po90
-rw-r--r--l10n/fr/user_webdavauth.po17
-rw-r--r--l10n/gl/settings.po104
-rw-r--r--l10n/gl/user_ldap.po87
-rw-r--r--l10n/gl/user_webdavauth.po17
-rw-r--r--l10n/he/core.po54
-rw-r--r--l10n/he/files_encryption.po27
-rw-r--r--l10n/he/settings.po105
-rw-r--r--l10n/he/user_ldap.po89
-rw-r--r--l10n/he/user_webdavauth.po15
-rw-r--r--l10n/hi/settings.po84
-rw-r--r--l10n/hi/user_ldap.po89
-rw-r--r--l10n/hi/user_webdavauth.po15
-rw-r--r--l10n/hr/settings.po102
-rw-r--r--l10n/hr/user_ldap.po89
-rw-r--r--l10n/hr/user_webdavauth.po15
-rw-r--r--l10n/hu_HU/settings.po102
-rw-r--r--l10n/hu_HU/user_ldap.po89
-rw-r--r--l10n/hu_HU/user_webdavauth.po15
-rw-r--r--l10n/ia/settings.po96
-rw-r--r--l10n/ia/user_ldap.po89
-rw-r--r--l10n/ia/user_webdavauth.po15
-rw-r--r--l10n/id/settings.po102
-rw-r--r--l10n/id/user_ldap.po87
-rw-r--r--l10n/id/user_webdavauth.po15
-rw-r--r--l10n/is/settings.po86
-rw-r--r--l10n/is/user_ldap.po87
-rw-r--r--l10n/is/user_webdavauth.po15
-rw-r--r--l10n/it/core.po38
-rw-r--r--l10n/it/settings.po102
-rw-r--r--l10n/it/user_ldap.po87
-rw-r--r--l10n/it/user_webdavauth.po15
-rw-r--r--l10n/ja_JP/core.po55
-rw-r--r--l10n/ja_JP/settings.po103
-rw-r--r--l10n/ja_JP/user_ldap.po88
-rw-r--r--l10n/ja_JP/user_webdavauth.po18
-rw-r--r--l10n/ka_GE/settings.po102
-rw-r--r--l10n/ka_GE/user_ldap.po87
-rw-r--r--l10n/ka_GE/user_webdavauth.po15
-rw-r--r--l10n/ko/settings.po104
-rw-r--r--l10n/ko/user_ldap.po87
-rw-r--r--l10n/ko/user_webdavauth.po17
-rw-r--r--l10n/ku_IQ/settings.po88
-rw-r--r--l10n/ku_IQ/user_ldap.po87
-rw-r--r--l10n/ku_IQ/user_webdavauth.po15
-rw-r--r--l10n/lb/settings.po102
-rw-r--r--l10n/lb/user_ldap.po89
-rw-r--r--l10n/lb/user_webdavauth.po15
-rw-r--r--l10n/lt_LT/settings.po98
-rw-r--r--l10n/lt_LT/user_ldap.po89
-rw-r--r--l10n/lt_LT/user_webdavauth.po15
-rw-r--r--l10n/lv/settings.po102
-rw-r--r--l10n/lv/user_ldap.po89
-rw-r--r--l10n/lv/user_webdavauth.po15
-rw-r--r--l10n/mk/core.po170
-rw-r--r--l10n/mk/files.po126
-rw-r--r--l10n/mk/files_encryption.po19
-rw-r--r--l10n/mk/files_external.po55
-rw-r--r--l10n/mk/files_sharing.po31
-rw-r--r--l10n/mk/files_versions.po19
-rw-r--r--l10n/mk/lib.po79
-rw-r--r--l10n/mk/settings.po137
-rw-r--r--l10n/mk/user_ldap.po96
-rw-r--r--l10n/mk/user_webdavauth.po16
-rw-r--r--l10n/ms_MY/settings.po102
-rw-r--r--l10n/ms_MY/user_ldap.po89
-rw-r--r--l10n/ms_MY/user_webdavauth.po15
-rw-r--r--l10n/nb_NO/settings.po102
-rw-r--r--l10n/nb_NO/user_ldap.po87
-rw-r--r--l10n/nb_NO/user_webdavauth.po15
-rw-r--r--l10n/nl/core.po80
-rw-r--r--l10n/nl/files_external.po17
-rw-r--r--l10n/nl/settings.po105
-rw-r--r--l10n/nl/user_ldap.po88
-rw-r--r--l10n/nl/user_webdavauth.po18
-rw-r--r--l10n/nn_NO/settings.po98
-rw-r--r--l10n/nn_NO/user_ldap.po89
-rw-r--r--l10n/nn_NO/user_webdavauth.po15
-rw-r--r--l10n/oc/settings.po102
-rw-r--r--l10n/oc/user_ldap.po87
-rw-r--r--l10n/oc/user_webdavauth.po15
-rw-r--r--l10n/pl/core.po46
-rw-r--r--l10n/pl/settings.po104
-rw-r--r--l10n/pl/user_ldap.po90
-rw-r--r--l10n/pl/user_webdavauth.po18
-rw-r--r--l10n/pl_PL/settings.po84
-rw-r--r--l10n/pl_PL/user_ldap.po89
-rw-r--r--l10n/pl_PL/user_webdavauth.po15
-rw-r--r--l10n/pt_BR/settings.po104
-rw-r--r--l10n/pt_BR/user_ldap.po87
-rw-r--r--l10n/pt_BR/user_webdavauth.po17
-rw-r--r--l10n/pt_PT/core.po54
-rw-r--r--l10n/pt_PT/files_external.po11
-rw-r--r--l10n/pt_PT/settings.po102
-rw-r--r--l10n/pt_PT/user_ldap.po85
-rw-r--r--l10n/pt_PT/user_webdavauth.po18
-rw-r--r--l10n/ro/core.po103
-rw-r--r--l10n/ro/files.po109
-rw-r--r--l10n/ro/lib.po37
-rw-r--r--l10n/ro/settings.po102
-rw-r--r--l10n/ro/user_ldap.po90
-rw-r--r--l10n/ro/user_webdavauth.po18
-rw-r--r--l10n/ru/settings.po105
-rw-r--r--l10n/ru/user_ldap.po90
-rw-r--r--l10n/ru/user_webdavauth.po18
-rw-r--r--l10n/ru_RU/core.po80
-rw-r--r--l10n/ru_RU/files.po80
-rw-r--r--l10n/ru_RU/files_external.po16
-rw-r--r--l10n/ru_RU/settings.po106
-rw-r--r--l10n/ru_RU/user_ldap.po85
-rw-r--r--l10n/ru_RU/user_webdavauth.po18
-rw-r--r--l10n/si_LK/settings.po102
-rw-r--r--l10n/si_LK/user_ldap.po87
-rw-r--r--l10n/si_LK/user_webdavauth.po17
-rw-r--r--l10n/sk_SK/settings.po104
-rw-r--r--l10n/sk_SK/user_ldap.po87
-rw-r--r--l10n/sk_SK/user_webdavauth.po17
-rw-r--r--l10n/sl/core.po54
-rw-r--r--l10n/sl/files_external.po10
-rw-r--r--l10n/sl/settings.po104
-rw-r--r--l10n/sl/user_ldap.po87
-rw-r--r--l10n/sl/user_webdavauth.po17
-rw-r--r--l10n/sq/settings.po84
-rw-r--r--l10n/sq/user_ldap.po87
-rw-r--r--l10n/sq/user_webdavauth.po15
-rw-r--r--l10n/sr/settings.po104
-rw-r--r--l10n/sr/user_ldap.po89
-rw-r--r--l10n/sr/user_webdavauth.po15
-rw-r--r--l10n/sr@latin/settings.po98
-rw-r--r--l10n/sr@latin/user_ldap.po89
-rw-r--r--l10n/sr@latin/user_webdavauth.po15
-rw-r--r--l10n/sv/core.po80
-rw-r--r--l10n/sv/files_external.po16
-rw-r--r--l10n/sv/settings.po102
-rw-r--r--l10n/sv/user_ldap.po87
-rw-r--r--l10n/sv/user_webdavauth.po15
-rw-r--r--l10n/ta_LK/settings.po102
-rw-r--r--l10n/ta_LK/user_ldap.po87
-rw-r--r--l10n/ta_LK/user_webdavauth.po17
-rw-r--r--l10n/templates/core.pot60
-rw-r--r--l10n/templates/files.pot38
-rw-r--r--l10n/templates/files_encryption.pot10
-rw-r--r--l10n/templates/files_external.pot8
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_versions.pot6
-rw-r--r--l10n/templates/lib.pot10
-rw-r--r--l10n/templates/settings.pot82
-rw-r--r--l10n/templates/user_ldap.pot83
-rw-r--r--l10n/templates/user_webdavauth.pot10
-rw-r--r--l10n/th_TH/files.po80
-rw-r--r--l10n/th_TH/settings.po102
-rw-r--r--l10n/th_TH/user_ldap.po89
-rw-r--r--l10n/th_TH/user_webdavauth.po17
-rw-r--r--l10n/tr/core.po134
-rw-r--r--l10n/tr/files.po100
-rw-r--r--l10n/tr/files_encryption.po27
-rw-r--r--l10n/tr/files_external.po35
-rw-r--r--l10n/tr/files_versions.po23
-rw-r--r--l10n/tr/lib.po77
-rw-r--r--l10n/tr/settings.po104
-rw-r--r--l10n/tr/user_ldap.po134
-rw-r--r--l10n/tr/user_webdavauth.po18
-rw-r--r--l10n/uk/settings.po103
-rw-r--r--l10n/uk/user_ldap.po86
-rw-r--r--l10n/uk/user_webdavauth.po18
-rw-r--r--l10n/vi/settings.po104
-rw-r--r--l10n/vi/user_ldap.po87
-rw-r--r--l10n/vi/user_webdavauth.po17
-rw-r--r--l10n/zh_CN.GB2312/settings.po102
-rw-r--r--l10n/zh_CN.GB2312/user_ldap.po87
-rw-r--r--l10n/zh_CN.GB2312/user_webdavauth.po15
-rw-r--r--l10n/zh_CN/core.po79
-rw-r--r--l10n/zh_CN/files_external.po17
-rw-r--r--l10n/zh_CN/settings.po105
-rw-r--r--l10n/zh_CN/user_ldap.po87
-rw-r--r--l10n/zh_CN/user_webdavauth.po18
-rw-r--r--l10n/zh_HK/settings.po84
-rw-r--r--l10n/zh_HK/user_ldap.po87
-rw-r--r--l10n/zh_HK/user_webdavauth.po15
-rw-r--r--l10n/zh_TW/settings.po104
-rw-r--r--l10n/zh_TW/user_ldap.po87
-rw-r--r--l10n/zh_TW/user_webdavauth.po17
-rw-r--r--l10n/zu_ZA/settings.po84
-rw-r--r--l10n/zu_ZA/user_ldap.po87
-rw-r--r--l10n/zu_ZA/user_webdavauth.po15
-rw-r--r--lib/MDB2/Driver/sqlite3.php3
-rwxr-xr-xlib/app.php20
-rw-r--r--lib/base.php1411
-rw-r--r--lib/db.php6
-rw-r--r--lib/filecache.php6
-rw-r--r--lib/files.php14
-rw-r--r--lib/helper.php2
-rw-r--r--lib/hook.php6
-rw-r--r--lib/l10n.php14
-rw-r--r--lib/l10n/ar.php5
-rw-r--r--lib/l10n/da.php7
-rw-r--r--lib/l10n/mk.php28
-rw-r--r--lib/l10n/ro.php7
-rw-r--r--lib/l10n/tr.php27
-rw-r--r--lib/log/owncloud.php15
-rw-r--r--lib/migrate.php162
-rw-r--r--lib/ocsclient.php8
-rw-r--r--lib/public/contacts.php33
-rw-r--r--lib/public/util.php36
-rwxr-xr-xlib/request.php6
-rw-r--r--lib/templatelayout.php30
-rw-r--r--lib/updater.php18
-rwxr-xr-xlib/util.php57
-rwxr-xr-xsettings/admin.php1
-rw-r--r--settings/ajax/togglegroups.php2
-rw-r--r--settings/css/settings.css3
-rw-r--r--settings/help.php28
-rw-r--r--settings/js/users.js796
-rw-r--r--settings/l10n/ar.php44
-rw-r--r--settings/l10n/bg_BG.php10
-rw-r--r--settings/l10n/ca.php24
-rw-r--r--settings/l10n/cs_CZ.php24
-rw-r--r--settings/l10n/da.php26
-rw-r--r--settings/l10n/de.php24
-rw-r--r--settings/l10n/de_DE.php26
-rw-r--r--settings/l10n/el.php24
-rw-r--r--settings/l10n/eo.php12
-rw-r--r--settings/l10n/es.php12
-rw-r--r--settings/l10n/es_AR.php12
-rw-r--r--settings/l10n/et_EE.php12
-rw-r--r--settings/l10n/eu.php24
-rw-r--r--settings/l10n/fa.php12
-rw-r--r--settings/l10n/fi_FI.php24
-rw-r--r--settings/l10n/fr.php24
-rw-r--r--settings/l10n/gl.php12
-rw-r--r--settings/l10n/he.php22
-rw-r--r--settings/l10n/hi.php4
-rw-r--r--settings/l10n/hr.php12
-rw-r--r--settings/l10n/hu_HU.php12
-rw-r--r--settings/l10n/ia.php8
-rw-r--r--settings/l10n/id.php12
-rw-r--r--settings/l10n/it.php24
-rw-r--r--settings/l10n/ja_JP.php24
-rw-r--r--settings/l10n/ka_GE.php12
-rw-r--r--settings/l10n/ko.php12
-rw-r--r--settings/l10n/ku_IQ.php6
-rw-r--r--settings/l10n/lb.php12
-rw-r--r--settings/l10n/lt_LT.php9
-rw-r--r--settings/l10n/lv.php11
-rw-r--r--settings/l10n/mk.php39
-rw-r--r--settings/l10n/ms_MY.php12
-rw-r--r--settings/l10n/nb_NO.php12
-rw-r--r--settings/l10n/nl.php24
-rw-r--r--settings/l10n/nn_NO.php9
-rw-r--r--settings/l10n/oc.php11
-rw-r--r--settings/l10n/pl.php12
-rw-r--r--settings/l10n/pt_BR.php12
-rw-r--r--settings/l10n/pt_PT.php24
-rw-r--r--settings/l10n/ro.php12
-rw-r--r--settings/l10n/ru.php19
-rw-r--r--settings/l10n/ru_RU.php24
-rw-r--r--settings/l10n/si_LK.php11
-rw-r--r--settings/l10n/sk_SK.php12
-rw-r--r--settings/l10n/sl.php12
-rw-r--r--settings/l10n/sr.php12
-rw-r--r--settings/l10n/sr@latin.php9
-rw-r--r--settings/l10n/sv.php24
-rw-r--r--settings/l10n/ta_LK.php12
-rw-r--r--settings/l10n/th_TH.php12
-rw-r--r--settings/l10n/tr.php23
-rw-r--r--settings/l10n/uk.php24
-rw-r--r--settings/l10n/vi.php12
-rw-r--r--settings/l10n/zh_CN.GB2312.php12
-rw-r--r--settings/l10n/zh_CN.php24
-rw-r--r--settings/l10n/zh_TW.php12
-rw-r--r--settings/templates/admin.php232
-rw-r--r--settings/templates/help.php67
-rw-r--r--settings/templates/personal.php30
-rw-r--r--settings/templates/settings.php2
482 files changed, 12768 insertions, 9304 deletions
diff --git a/.gitignore b/.gitignore
index 7c0df64b864..819347f540f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,9 @@ nbproject
# WebFinger
.well-known
/.buildpath
+
+#tests - autogenerated filed
+data-autotest
+/tests/coverage*
+/tests/autoconfig*
+/tests/autotest*
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 57c8c15c197..6532b76df21 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
$dir = stripslashes($_POST["dir"]);
$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);
-$files = explode(';', $files);
+$files = json_decode($files);
$filesWithError = '';
$success = true;
//Now delete
diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php
deleted file mode 100644
index b547d162b3e..00000000000
--- a/apps/files/ajax/timezone.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$_SESSION['timezone'] = $_GET['time'];
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index afc72916e09..99c39f0acdb 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -12,16 +12,16 @@
#new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
#new>a { padding:.5em 1.2em .3em; }
#new>ul {
- display:none; position:fixed; min-width:7em; z-index:-1;
- padding:.5em; margin-top:0.075em; margin-left:-.5em;
+ display:none; position:fixed; min-width:7em; z-index:10;
+ padding:.5em; padding-bottom:0; margin-top:.075em; margin-left:-.5em;
text-align:left;
- background:#f8f8f8; border:1px solid #ddd;
+ background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0;
+ box-shadow:0 2px 7px rgba(170,170,170,.4);
}
#new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
background-repeat:no-repeat; cursor:pointer; }
#new>ul>li>p { cursor:pointer; }
#new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new .popup { border-top-left-radius:0; z-index:10; }
#upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
@@ -64,11 +64,17 @@ tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Op
table tr.mouseOver td { background-color:#eee; }
table th { height:2em; padding:0 .5em; color:#999; }
table th .name { float:left; margin-left:.5em; }
-table th.multiselect { background:#ddd; color:#000; font-weight:bold; }
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
table td { border-bottom:1px solid #eee; font-style:normal; background-position:1em .5em; background-repeat:no-repeat; }
-table th#headerSize, table td.filesize { width:3em; padding:0 1em; text-align:right; }
-table th#headerDate, table td.date { width:11em; padding:0 .1em 0 1em; text-align:left; }
+table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ }
+table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; }
+table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
+
+/* Multiselect bar */
+table.multiselect { top:63px; }
+table.multiselect thead { position:fixed; top:82px; z-index:1; }
+table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
+
table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
@@ -79,15 +85,28 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0
table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; }
table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
-table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
-table thead.fixed { height:2em; }
#fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
#fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
#fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-#fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; position:relative; }
+#fileList tr td.filename {
+ position:relative; width:100%;
+ -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
+}
#select_all { float:left; margin:.3em 0.6em 0 .5em; }
#uploadsize-message,#delete-confirm { display:none; }
-.fileactions { position:relative; top:.3em; font-size:.8em; float:right; }
+
+/* File actions */
+.fileactions {
+ position:absolute; top:.6em; right:0;
+ font-size:.8em;
+}
+#fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ }
+#fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
+ background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9);
+}
+#fileList tr.selected:hover .fileactions { /* slightly darker color for selected rows */
+ background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9);
+}
#fileList .fileactions a.action img { position:relative; top:.2em; }
#fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
a.action.delete { float:right; }
diff --git a/apps/files/download.php b/apps/files/download.php
index 6475afb56e0..e2149cd4135 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -40,7 +40,12 @@ if(!OC_Filesystem::file_exists($filename)) {
$ftype=OC_Filesystem::getMimeType( $filename );
header('Content-Type:'.$ftype);
-header('Content-Disposition: attachment; filename="'.basename($filename).'"');
+if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+ header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+} else {
+ header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+ . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+}
OCP\Response::disableCaching();
header('Content-Length: '.OC_Filesystem::filesize($filename));
diff --git a/apps/files/index.php b/apps/files/index.php
index c45fe60e4f7..b64bde44cc0 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -1,114 +1,111 @@
<?php
/**
-* ownCloud - ajax frontend
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud - ajax frontend
+ *
+ * @author Robin Appelman
+ * @copyright 2010 Robin Appelman icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
// Check if we are a user
OCP\User::checkLoggedIn();
// Load the files we need
-OCP\Util::addStyle( 'files', 'files' );
-OCP\Util::addscript( 'files', 'jquery.iframe-transport' );
-OCP\Util::addscript( 'files', 'jquery.fileupload' );
-OCP\Util::addscript( 'files', 'files' );
-OCP\Util::addscript( 'files', 'filelist' );
-OCP\Util::addscript( 'files', 'fileactions' );
-OCP\Util::addscript( 'files', 'keyboardshortcuts' );
-if(!isset($_SESSION['timezone'])) {
- OCP\Util::addscript( 'files', 'timezone' );
-}
-OCP\App::setActiveNavigationEntry( 'files_index' );
+OCP\Util::addStyle('files', 'files');
+OCP\Util::addscript('files', 'jquery.iframe-transport');
+OCP\Util::addscript('files', 'jquery.fileupload');
+OCP\Util::addscript('files', 'files');
+OCP\Util::addscript('files', 'filelist');
+OCP\Util::addscript('files', 'fileactions');
+OCP\Util::addscript('files', 'keyboardshortcuts');
+
+OCP\App::setActiveNavigationEntry('files_index');
// Load the files
-$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
// Redirect if directory does not exist
-if(!OC_Filesystem::is_dir($dir.'/')) {
- header('Location: '.$_SERVER['SCRIPT_NAME'].'');
- exit();
+if (!OC_Filesystem::is_dir($dir . '/')) {
+ header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
+ exit();
}
$files = array();
-foreach( OC_Files::getdirectorycontent( $dir ) as $i ) {
- $i['date'] = OCP\Util::formatDate($i['mtime'] );
- if($i['type']=='file') {
- $fileinfo=pathinfo($i['name']);
- $i['basename']=$fileinfo['filename'];
- if (!empty($fileinfo['extension'])) {
- $i['extension']='.' . $fileinfo['extension'];
- }
- else {
- $i['extension']='';
- }
- }
- if($i['directory']=='/') {
- $i['directory']='';
- }
- $files[] = $i;
+foreach (OC_Files::getdirectorycontent($dir) as $i) {
+ $i['date'] = OCP\Util::formatDate($i['mtime']);
+ if ($i['type'] == 'file') {
+ $fileinfo = pathinfo($i['name']);
+ $i['basename'] = $fileinfo['filename'];
+ if (!empty($fileinfo['extension'])) {
+ $i['extension'] = '.' . $fileinfo['extension'];
+ } else {
+ $i['extension'] = '';
+ }
+ }
+ if ($i['directory'] == '/') {
+ $i['directory'] = '';
+ }
+ $files[] = $i;
}
// Make breadcrumb
$breadcrumb = array();
$pathtohere = '';
-foreach( explode( '/', $dir ) as $i ) {
- if( $i != '' ) {
- $pathtohere .= '/'.$i;
- $breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
- }
+foreach (explode('/', $dir) as $i) {
+ if ($i != '') {
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+ }
}
// make breadcrumb und filelist markup
-$list = new OCP\Template( 'files', 'part.list', '' );
-$list->assign( 'files', $files, false );
-$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false);
-$list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=', false);
-$breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
-$breadcrumbNav->assign( 'breadcrumb', $breadcrumb, false );
-$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false);
+$list = new OCP\Template('files', 'part.list', '');
+$list->assign('files', $files, false);
+$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
+$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false);
+$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
+$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-$freeSpace=OC_Filesystem::free_space($dir);
-$freeSpace=max($freeSpace, 0);
+$freeSpace = OC_Filesystem::free_space($dir);
+$freeSpace = max($freeSpace, 0);
$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
$permissions = OCP\PERMISSION_READ;
-if (OC_Filesystem::isUpdatable($dir.'/')) {
- $permissions |= OCP\PERMISSION_UPDATE;
+if (OC_Filesystem::isUpdatable($dir . '/')) {
+ $permissions |= OCP\PERMISSION_UPDATE;
}
-if (OC_Filesystem::isDeletable($dir.'/')) {
- $permissions |= OCP\PERMISSION_DELETE;
+if (OC_Filesystem::isDeletable($dir . '/')) {
+ $permissions |= OCP\PERMISSION_DELETE;
}
-if (OC_Filesystem::isSharable($dir.'/')) {
- $permissions |= OCP\PERMISSION_SHARE;
+if (OC_Filesystem::isSharable($dir . '/')) {
+ $permissions |= OCP\PERMISSION_SHARE;
}
-$tmpl = new OCP\Template( 'files', 'index', 'user' );
-$tmpl->assign( 'fileList', $list->fetchPage(), false );
-$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
-$tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir));
-$tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/'));
+$tmpl = new OCP\Template('files', 'index', 'user');
+$tmpl->assign('fileList', $list->fetchPage(), false);
+$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+$tmpl->assign('dir', OC_Filesystem::normalizePath($dir));
+$tmpl->assign('isCreatable', OC_Filesystem::isCreatable($dir . '/'));
$tmpl->assign('permissions', $permissions);
-$tmpl->assign( 'files', $files );
-$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->assign('files', $files);
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->printPage();
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9f0bafafbdf..96dd0323d29 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -288,7 +288,7 @@ var FileList={
},
finishDelete:function(ready,sync){
if(!FileList.deleteCanceled && FileList.deleteFiles){
- var fileNames=FileList.deleteFiles.join(';');
+ var fileNames=JSON.stringify(FileList.deleteFiles);
$.ajax({
url: OC.filePath('files', 'ajax', 'delete.php'),
async:!sync,
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 33c775fc8ec..6a37d9e7f53 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -203,6 +203,9 @@ $(document).ready(function() {
var files = data.files;
var totalSize=0;
if(files){
+ if (FileList.lastAction) {
+ FileList.lastAction();
+ }
for(var i=0;i<files.length;i++){
if(files[i].size ==0 && files[i].type== '')
{
@@ -513,6 +516,9 @@ $(document).ready(function() {
$('#notification').fadeIn();
return;
}
+ if (FileList.lastAction) {
+ FileList.lastAction();
+ }
var name = getUniqueName($(this).val());
if (name != $(this).val()) {
FileList.checkName(name, $(this).val(), true);
@@ -770,22 +776,14 @@ function procesSelection(){
var selected=getSelectedFiles();
var selectedFiles=selected.filter(function(el){return el.type=='file'});
var selectedFolders=selected.filter(function(el){return el.type=='dir'});
- if(selectedFiles.length==0 && selectedFolders.length==0){
+ if(selectedFiles.length==0 && selectedFolders.length==0) {
$('#headerName>span.name').text(t('files','Name'));
$('#headerSize').text(t('files','Size'));
$('#modified').text(t('files','Modified'));
- $('th').removeClass('multiselect');
+ $('table').removeClass('multiselect');
$('.selectedActions').hide();
- $('thead').removeClass('fixed');
- $('#headerName').css('width','auto');
- $('#headerSize').css('width','auto');
- $('#headerDate').css('width','auto');
- $('table').css('padding-top','0');
- }else{
- var width={name:$('#headerName').css('width'),size:$('#headerSize').css('width'),date:$('#headerDate').css('width')};
- $('#headerName').css('width',width.name);
- $('#headerSize').css('width',width.size);
- $('#headerDate').css('width',width.date);
+ }
+ else {
$('.selectedActions').show();
var totalSize=0;
for(var i=0;i<selectedFiles.length;i++){
@@ -817,7 +815,7 @@ function procesSelection(){
}
$('#headerName>span.name').text(selection);
$('#modified').text('');
- $('th').addClass('multiselect');
+ $('table').addClass('multiselect');
}
}
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js
index 562755f55b7..cc2b5d42139 100644
--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@@ -127,6 +127,9 @@ var Files = Files || {};
}
Files.bindKeyboardShortcuts = function(document, $) {
$(document).keydown(function(event) { //check for modifier keys
+ if(!$(event.target).is('body')) {
+ return;
+ }
var preventDefault = false;
if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
if (
diff --git a/apps/files/js/timezone.js b/apps/files/js/timezone.js
deleted file mode 100644
index 4749417199d..00000000000
--- a/apps/files/js/timezone.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//send the clients time zone to the server
-$(document).ready(function() {
- var visitortimezone = (-new Date().getTimezoneOffset()/60);
- $.ajax({
- type: "GET",
- url: OC.filePath('files', 'ajax', 'timezone.php'),
- data: 'time='+ visitortimezone,
- success: function(){
- location.reload();
- }
- });
-}); \ No newline at end of file
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 24652622c61..05404d27af7 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
"The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
"No file was uploaded" => "Ingen fil blev uploadet",
@@ -18,6 +19,7 @@
"replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
"unshared {files}" => "ikke delte {files}",
"deleted {files}" => "slettede {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
"generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
"Upload Error" => "Fejl ved upload",
@@ -27,6 +29,7 @@
"{count} files uploading" => "{count} filer uploades",
"Upload cancelled." => "Upload afbrudt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
"{count} files scanned" => "{count} filer skannet",
"error while scanning" => "fejl under scanning",
"Name" => "Navn",
@@ -47,6 +50,7 @@
"New" => "Ny",
"Text file" => "Tekstfil",
"Folder" => "Mappe",
+"From link" => "Fra link",
"Upload" => "Upload",
"Cancel upload" => "Fortryd upload",
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index ddbea421241..fce7a07c948 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -28,7 +28,7 @@
"1 file uploading" => "1 αρχείο ανεβαίνει",
"{count} files uploading" => "{count} αρχεία ανεβαίνουν",
"Upload cancelled." => "Η αποστολή ακυρώθηκε.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud",
"{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν",
"error while scanning" => "σφάλμα κατά την ανίχνευση",
@@ -56,7 +56,7 @@
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
"Download" => "Λήψη",
"Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν το διακομιστή.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε",
"Current scanning" => "Τρέχουσα αναζήτηση "
);
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index c47fdbdbf4f..1d22746156e 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,21 +1,44 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Нема грешка, датотеката беше подигната успешно",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата",
"The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
"No file was uploaded" => "Не беше подигната датотека",
"Missing a temporary folder" => "Не постои привремена папка",
"Failed to write to disk" => "Неуспеав да запишам на диск",
"Files" => "Датотеки",
+"Unshare" => "Не споделувај",
"Delete" => "Избриши",
+"Rename" => "Преименувај",
+"{new_name} already exists" => "{new_name} веќе постои",
+"replace" => "замени",
+"suggest name" => "предложи име",
+"cancel" => "откажи",
+"replaced {new_name}" => "земенета {new_name}",
+"undo" => "врати",
+"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
+"unshared {files}" => "без споделување {files}",
+"deleted {files}" => "избришани {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
"generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
"Upload Error" => "Грешка при преземање",
"Close" => "Затвои",
"Pending" => "Чека",
+"1 file uploading" => "1 датотека се подига",
+"{count} files uploading" => "{count} датотеки се подигаат",
"Upload cancelled." => "Преземањето е прекинато.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud",
+"{count} files scanned" => "{count} датотеки скенирани",
+"error while scanning" => "грешка при скенирање",
"Name" => "Име",
"Size" => "Големина",
"Modified" => "Променето",
+"1 folder" => "1 папка",
+"{count} folders" => "{count} папки",
+"1 file" => "1 датотека",
+"{count} files" => "{count} датотеки",
"File handling" => "Ракување со датотеки",
"Maximum upload size" => "Максимална големина за подигање",
"max. possible: " => "макс. можно:",
@@ -27,6 +50,7 @@
"New" => "Ново",
"Text file" => "Текстуална датотека",
"Folder" => "Папка",
+"From link" => "Од врска",
"Upload" => "Подигни",
"Cancel upload" => "Откажи прикачување",
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 34e8dc8a50e..7244a6677a3 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Nicio eroare, fișierul a fost încărcat cu succes",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
"No file was uploaded" => "Niciun fișier încărcat",
@@ -9,22 +10,35 @@
"Unshare" => "Anulează partajarea",
"Delete" => "Șterge",
"Rename" => "Redenumire",
+"{new_name} already exists" => "{new_name} deja exista",
"replace" => "înlocuire",
"suggest name" => "sugerează nume",
"cancel" => "anulare",
+"replaced {new_name}" => "inlocuit {new_name}",
"undo" => "Anulează ultima acțiune",
+"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
+"unshared {files}" => "nedistribuit {files}",
+"deleted {files}" => "Sterse {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
"generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
"Upload Error" => "Eroare la încărcare",
"Close" => "Închide",
"Pending" => "În așteptare",
"1 file uploading" => "un fișier se încarcă",
+"{count} files uploading" => "{count} fisiere incarcate",
"Upload cancelled." => "Încărcare anulată.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nume de folder invalid. Numele este rezervat pentru OwnCloud",
+"{count} files scanned" => "{count} fisiere scanate",
"error while scanning" => "eroare la scanarea",
"Name" => "Nume",
"Size" => "Dimensiune",
"Modified" => "Modificat",
+"1 folder" => "1 folder",
+"{count} folders" => "{count} foldare",
+"1 file" => "1 fisier",
+"{count} files" => "{count} fisiere",
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
"max. possible: " => "max. posibil:",
@@ -36,6 +50,7 @@
"New" => "Nou",
"Text file" => "Fișier text",
"Folder" => "Dosar",
+"From link" => "de la adresa",
"Upload" => "Încarcă",
"Cancel upload" => "Anulează încărcarea",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 5a6c032ed96..bb701aac002 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
"No file was uploaded" => "Файл не был загружен",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 343138ba126..bad817ab006 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML",
"The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์",
"No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 061ed1f3ae2..7cd3a82cd71 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor",
"The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi",
"No file was uploaded" => "Hiç dosya yüklenmedi",
@@ -15,20 +16,29 @@
"cancel" => "iptal",
"replaced {new_name}" => "değiştirilen {new_name}",
"undo" => "geri al",
+"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
"unshared {files}" => "paylaşılmamış {files}",
"deleted {files}" => "silinen {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
"generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
"Upload Error" => "Yükleme hatası",
"Close" => "Kapat",
"Pending" => "Bekliyor",
"1 file uploading" => "1 dosya yüklendi",
+"{count} files uploading" => "{count} dosya yükleniyor",
"Upload cancelled." => "Yükleme iptal edildi.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Geçersiz dizin ismi. \"Shared\" dizini OwnCloud tarafından kullanılmaktadır.",
+"{count} files scanned" => "{count} dosya tarandı",
"error while scanning" => "tararamada hata oluşdu",
"Name" => "Ad",
"Size" => "Boyut",
"Modified" => "Değiştirilme",
+"1 folder" => "1 dizin",
+"{count} folders" => "{count} dizin",
+"1 file" => "1 dosya",
+"{count} files" => "{count} dosya",
"File handling" => "Dosya taşıma",
"Maximum upload size" => "Maksimum yükleme boyutu",
"max. possible: " => "mümkün olan en fazla: ",
@@ -40,6 +50,7 @@
"New" => "Yeni",
"Text file" => "Metin dosyası",
"Folder" => "Klasör",
+"From link" => "Bağlantıdan",
"Upload" => "Yükle",
"Cancel upload" => "Yüklemeyi iptal et",
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 66fec4cd536..0de12edcba5 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -15,11 +15,11 @@
<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>'
title="<?php echo $l->t( '0 is unlimited' ); ?>"
- <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> />
- <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
+ <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
+ <em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br />
<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
value="<?php echo $l->t( 'Save' ); ?>"/>
</fieldset>
-</form> \ No newline at end of file
+</form>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bd34c9a76d9..edf048c7e13 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -5,7 +5,7 @@
<div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
<div id="new" class="button">
<a><?php echo $l->t('New');?></a>
- <ul class="popup popupTop">
+ <ul>
<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')"
data-type='file'><p><?php echo $l->t('Text file');?></p></li>
<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')"
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
new file mode 100644
index 00000000000..0332d59520a
--- /dev/null
+++ b/apps/files_encryption/l10n/he.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "הצפנה",
+"Enable Encryption" => "הפעל הצפנה",
+"None" => "כלום",
+"Exclude the following file types from encryption" => "הוצא את סוגי הקבצים הבאים מהצפנה"
+);
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
new file mode 100644
index 00000000000..dfcaed9f37e
--- /dev/null
+++ b/apps/files_encryption/l10n/mk.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Енкрипција",
+"Exclude the following file types from encryption" => "Исклучи ги следните типови на датотеки од енкрипција",
+"None" => "Ништо",
+"Enable Encryption" => "Овозможи енкрипција"
+);
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
new file mode 100644
index 00000000000..474ee42b842
--- /dev/null
+++ b/apps/files_encryption/l10n/tr.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Şifreleme",
+"Enable Encryption" => "Şifrelemeyi Etkinleştir",
+"None" => "Hiçbiri",
+"Exclude the following file types from encryption" => "Aşağıdaki dosya tiplerini şifrelemeye dahil etme"
+);
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 6b2b03211e2..94ff5ab94ba 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -6,6 +6,8 @@
* See the COPYING-README file.
*/
+OC_Util::checkAdminUser();
+
$tmpl = new OCP\Template( 'files_encryption', 'settings');
$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
'type_blacklist',
@@ -17,4 +19,4 @@ $tmpl->assign('encryption_enabled', $enabled);
OCP\Util::addscript('files_encryption', 'settings');
OCP\Util::addscript('core', 'multiselect');
-return $tmpl->fetchPage(); \ No newline at end of file
+return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 75df784e397..268b1a80ccd 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,14 +1,14 @@
<form id="calendar">
<fieldset class="personalblock">
- <strong><?php echo $l->t('Encryption'); ?></strong>
- <?php echo $l->t('Exclude the following file types from encryption'); ?>
+ <legend><strong><?php echo $l->t('Encryption');?></strong></legend>
+ <input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
+ id='enable_encryption' ></input>
+ <label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
<?php foreach ($_['blacklist'] as $type): ?>
<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
<?php endforeach;?>
- </select>
- <input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
- id='enable_encryption' ></input>
- <label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
+ </select><br />
+ <?php echo $l->t('Exclude the following file types from encryption'); ?>
</fieldset>
</form>
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index 00a81f3da16..bae89a6cfdd 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Udfyld alle nødvendige felter",
"Please provide a valid Dropbox app key and secret." => "Angiv venligst en valid Dropbox app nøgle og hemmelighed",
"Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive plads",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
"External Storage" => "Ekstern opbevaring",
"Mount point" => "Monteringspunkt",
"Backend" => "Backend",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 5d57e5e4598..277cc2e6efe 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
"Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator.",
"External Storage" => "Externer Speicher",
"Mount point" => "Mount-Point",
"Backend" => "Backend",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 357968bd462..5675eb057f0 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
"Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
"External Storage" => "Externer Speicher",
"Mount point" => "Mount-Point",
"Backend" => "Backend",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index a1dae9d4888..9bf499a911d 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Συμπληρώστε όλα τα απαιτούμενα πεδία",
"Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
"Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
"Mount point" => "Σημείο προσάρτησης",
"Backend" => "Σύστημα υποστήριξης",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index dccd377b119..597204c894d 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Bete eskatutako eremu guztiak",
"Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
"Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
"External Storage" => "Kanpoko Biltegiratzea",
"Mount point" => "Montatze puntua",
"Backend" => "Motorra",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 90007aafaaf..2c95e0d8b09 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Veuillez remplir tous les champs requis",
"Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
"Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas possible. Contactez votre administrateur système pour l'installer.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas possible. Contactez votre administrateur système pour l'installer.",
"External Storage" => "Stockage externe",
"Mount point" => "Point de montage",
"Backend" => "Infrastructure",
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 8fde4fcde0f..e3c1e4652b3 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,5 +1,26 @@
<?php $TRANSLATIONS = array(
+"Access granted" => "Пристапот е дозволен",
+"Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
+"Grant access" => "Дозволи пристап",
+"Fill out all required fields" => "Пополни ги сите задолжителни полиња",
+"Please provide a valid Dropbox app key and secret." => "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
+"Error configuring Google Drive storage" => "Грешка при конфигурација на Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Не е овозможена или инсталирани FTP подршка во PHP. Не е можно монтирање на FTP дискови. Замолете го Вашиот систем администратор да го инсталира.",
+"External Storage" => "Надворешно складиште",
+"Mount point" => "Точка на монтирање",
+"Backend" => "Админ",
+"Configuration" => "Конфигурација",
+"Options" => "Опции",
+"Applicable" => "Применливо",
+"Add mount point" => "Додади точка на монтирање",
+"None set" => "Ништо поставено",
+"All Users" => "Сите корисници",
"Groups" => "Групи",
"Users" => "Корисници",
-"Delete" => "Избриши"
+"Delete" => "Избриши",
+"Enable User External Storage" => "Овозможи надворешни за корисници",
+"Allow users to mount their own external storage" => "Дозволи им на корисниците да монтираат свои надворешни дискови",
+"SSL root certificates" => "SSL root сертификати",
+"Import Root Certificate" => "Увези"
);
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index d0c0b02b8f8..132c8cf3ac2 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Vul alle verplichte in",
"Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.",
"Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
"External Storage" => "Externe opslag",
"Mount point" => "Aankoppelpunt",
"Backend" => "Backend",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 4795a51a6b7..06dbc0cf6bd 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Preencha todos os campos obrigatórios",
"Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
"Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
"External Storage" => "Armazenamento Externo",
"Mount point" => "Ponto de montagem",
"Backend" => "Backend",
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index 493e3f5bee4..e539b3cb2cf 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Заполните все требуемые поля",
"Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.",
"Error configuring Google Drive storage" => "Ошибка настройки хранилища Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.",
"External Storage" => "Внешние системы хранения данных",
"Mount point" => "Точка монтирования",
"Backend" => "Бэкэнд",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 713e89578e2..f0db66ded96 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Zapolni vsa zahtevana polja",
"Please provide a valid Dropbox app key and secret." => "Vpišite veljaven ključ programa in kodo za Dropbox",
"Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči.",
"External Storage" => "Zunanja podatkovna shramba",
"Mount point" => "Priklopna točka",
"Backend" => "Zaledje",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 0a5e1c66d99..0d42a1f4682 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Fyll i alla obligatoriska fält",
"Please provide a valid Dropbox app key and secret." => "Ange en giltig Dropbox nyckel och hemlighet.",
"Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat.",
"External Storage" => "Extern lagring",
"Mount point" => "Monteringspunkt",
"Backend" => "Källa",
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index c5e9f8f892f..e9a045aab57 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,5 +1,16 @@
<?php $TRANSLATIONS = array(
+"External Storage" => "Harici Depolama",
+"Mount point" => "Bağlama Noktası",
+"Backend" => "Yönetici",
+"Configuration" => "Yapılandırma",
+"Options" => "Seçenekler",
+"Applicable" => "Uygulanabilir",
+"Add mount point" => "Bağlama noktası ekle",
+"None set" => "Hiçbiri",
+"All Users" => "Tüm Kullanıcılar",
"Groups" => "Gruplar",
"Users" => "Kullanıcılar",
-"Delete" => "Sil"
+"Delete" => "Sil",
+"SSL root certificates" => "SSL kök sertifikaları",
+"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar"
);
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 247ef7ce95c..1bb88564630 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "完成所有必填项",
"Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
"Error configuring Google Drive storage" => "配置Google Drive存储时出错",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b>“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b>PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。",
"External Storage" => "外部存储",
"Mount point" => "挂载点",
"Backend" => "后端",
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index c0864dc50d2..1be544fbc07 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -331,7 +331,7 @@ class OC_Mount_Config {
foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
$content .= "\t\t'".$group."' => array (\n";
foreach ($mounts as $mountPoint => $mount) {
- $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
+ $content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
}
$content .= "\t\t),\n";
@@ -343,7 +343,7 @@ class OC_Mount_Config {
foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
$content .= "\t\t'".$user."' => array (\n";
foreach ($mounts as $mountPoint => $mount) {
- $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+ $content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
}
$content .= "\t\t),\n";
}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 509c2977622..4215b28787e 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -29,6 +29,6 @@ $tmpl = new OCP\Template('files_external', 'settings');
$tmpl->assign('isAdminPage', false, false);
$tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
$tmpl->assign('certs', OC_Mount_Config::getCertificates());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
$tmpl->assign('backends', $backends);
return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 94222149a38..cd0bfa99585 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -20,6 +20,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+OC_Util::checkAdminUser();
+
OCP\Util::addScript('files_external', 'settings');
OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
OCP\Util::addStyle('files_external', 'settings');
@@ -30,6 +32,6 @@ $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
$tmpl->assign('backends', OC_Mount_Config::getBackends());
$tmpl->assign('groups', OC_Group::getGroups());
$tmpl->assign('users', OCP\User::getUsers());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
$tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 50f4a16a5ab..dd537d779a6 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -127,19 +127,14 @@
</fieldset>
</form>
+<?php if ( ! $_['isAdminPage']): ?>
<form id="files_external"
method="post"
enctype="multipart/form-data"
action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
<fieldset class="personalblock">
-<?php if ( ! $_['isAdminPage']): ?>
+ <legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend>
<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
- <thead>
- <tr>
- <th><?php echo $l->t('SSL root certificates'); ?></th>
- <th>&nbsp;</th>
- </tr>
- </thead>
<tbody width="100%">
<?php foreach ($_['certs'] as $rootCert): ?>
<tr id="<?php echo $rootCert ?>">
@@ -156,6 +151,6 @@
</table>
<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
- <?php endif; ?>
</fieldset>
</form>
+<?php endif; ?>
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
new file mode 100644
index 00000000000..4cf3f8c0920
--- /dev/null
+++ b/apps/files_sharing/l10n/ar.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "كلمة المرور",
+"Submit" => "تطبيق",
+"%s shared the folder %s with you" => "%s شارك المجلد %s معك",
+"%s shared the file %s with you" => "%s شارك الملف %s معك",
+"Download" => "تحميل",
+"No preview available for" => "لا يوجد عرض مسبق لـ",
+"web services under your control" => "خدمات الشبكة تحت سيطرتك"
+);
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
new file mode 100644
index 00000000000..16c7ee0eb04
--- /dev/null
+++ b/apps/files_sharing/l10n/mk.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Лозинка",
+"Submit" => "Прати",
+"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
+"%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
+"Download" => "Преземи",
+"No preview available for" => "Нема достапно преглед за",
+"web services under your control" => "веб сервиси под Ваша контрола"
+);
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 71c18380a3b..fef0ed8a8c2 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -160,7 +160,7 @@ if ($linkItem) {
exit();
}
}
- $basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
+ $basePath = substr($pathAndUser['path'], strlen('/'.$fileOwner.'/files'));
$path = $basePath;
if (isset($_GET['path'])) {
$path .= $_GET['path'];
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 599d302e6e4..afc0a67edba 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -10,7 +10,7 @@ OCP\App::registerPersonal('files_versions', 'settings-personal');
OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'write', "OCA_Versions\Hooks", "write_hook");
// Listen to delete and rename signals
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook");
OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook"); \ No newline at end of file
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index deff735cedc..d4c278ebd85 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -33,7 +33,7 @@ if ( isset( $_GET['path'] ) ) {
$versions = new OCA_Versions\Storage();
// roll back to old version if button clicked
- if( isset( $_GET['revert'] ) ) {
+ if( isset( $_GET['revert'] ) ) {
if( $versions->rollback( $path, $_GET['revert'] ) ) {
@@ -52,7 +52,7 @@ if ( isset( $_GET['path'] ) ) {
}
// show the history only if there is something to show
- if( OCA_Versions\Storage::isversioned( $path ) ) {
+ if( OCA_Versions\Storage::isversioned( $path ) ) {
$count = 999; //show the newest revisions
$versions = OCA_Versions\Storage::getVersions( $path, $count);
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
new file mode 100644
index 00000000000..fea7f1c7562
--- /dev/null
+++ b/apps/files_versions/l10n/ar.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "إنهاء تاريخ الإنتهاء لجميع الإصدارات",
+"History" => "السجل الزمني",
+"Versions" => "الإصدارات",
+"This will delete all existing backup versions of your files" => "هذه العملية ستقوم بإلغاء جميع إصدارات النسخ الاحتياطي للملفات",
+"Files Versioning" => "أصدرة الملفات",
+"Enable" => "تفعيل"
+);
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
new file mode 100644
index 00000000000..60a06ad3384
--- /dev/null
+++ b/apps/files_versions/l10n/mk.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Истечи ги сите верзии",
+"History" => "Историја",
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки",
+"Files Versioning" => "Верзии на датотеки",
+"Enable" => "Овозможи"
+);
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
new file mode 100644
index 00000000000..73f207d5024
--- /dev/null
+++ b/apps/files_versions/l10n/tr.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Tüm sürümleri sona erdir",
+"History" => "Geçmiş",
+"Versions" => "Sürümler",
+"This will delete all existing backup versions of your files" => "Bu dosyalarınızın tüm yedek sürümlerini silecektir",
+"Files Versioning" => "Dosya Sürümleri",
+"Enable" => "Etkinleştir"
+);
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 854d032da62..cc5a494f19e 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -23,7 +23,9 @@ if( isset( $_['message'] ) ) {
echo ' ';
echo OCP\Util::formatDate( doubleval($v['version']) );
echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
- if ( $v['cur'] ) { echo ' (<b>Current</b>)'; }
+ if ( $v['cur'] ) {
+ echo ' (<b>Current</b>)';
+ }
echo '<br /><br />';
}
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index 6d97cea46c3..2b313a07c88 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -3,12 +3,10 @@
<legend>
<strong><?php echo $l->t('Versions'); ?></strong>
</legend>
- <p>
- <?php echo $l->t('This will delete all existing backup versions of your files'); ?>
- </p>
<button id="expireAllBtn">
<?php echo $l->t('Expire all versions'); ?>
<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
- </button>
+ </button>
+ <br /><em><?php echo $l->t('This will delete all existing backup versions of your files'); ?></em>
</fieldset>
</form>
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
new file mode 100644
index 00000000000..ced0b4293b7
--- /dev/null
+++ b/apps/user_ldap/l10n/ar.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "كلمة المرور"
+);
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index be72912040d..d801ddff631 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
"Host" => "Màquina",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
"Base DN" => "DN Base",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c90dc9ed568..0c14ebb9d1e 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval.",
"Host" => "Počítač",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
"Base DN" => "Základní DN",
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index cce3de085d2..b11b56f9b65 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -2,10 +2,24 @@
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
"Base DN" => "Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
"User DN" => "Bruger DN",
"Password" => "Kodeord",
+"For anonymous access, leave DN and Password empty." => "For anonym adgang, skal du lade DN og Adgangskode tomme.",
+"User Login Filter" => "Bruger Login Filter",
+"User List Filter" => "Brugerliste Filter",
+"Defines the filter to apply, when retrieving users." => "Definere filteret der bruges ved indlæsning af brugere.",
+"Group Filter" => "Gruppe Filter",
+"Defines the filter to apply, when retrieving groups." => "Definere filteret der bruges når der indlæses grupper.",
"Port" => "Port",
+"Base User Tree" => "Base Bruger Træ",
+"Base Group Tree" => "Base Group Tree",
+"Group-Member association" => "Group-Member association",
"Use TLS" => "Brug TLS",
+"Do not use it for SSL connections, it will fail." => "Brug ikke til SSL forbindelser, da den vil fejle.",
+"Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering",
"Not recommended, use for testing only." => "Anbefales ikke, brug kun for at teste.",
+"User Display Name Field" => "User Display Name Field",
+"in bytes" => "i bytes",
"Help" => "Hjælp"
);
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 97debcbab60..87579cb2431 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
"Base DN" => "Basis-DN",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index e6288c78af4..f986ae83e87 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
"Base DN" => "Basis-DN",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index e973eaac0a9..8c421cf162b 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,18 +1,39 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει.",
+"Host" => "Διακομιστής",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
"Base DN" => "Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
"User DN" => "User DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
"Password" => "Συνθηματικό",
+"For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
"User Login Filter" => "User Login Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. ",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\"",
"User List Filter" => "User List Filter",
+"Defines the filter to apply, when retrieving users." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών.",
+"without any placeholder, e.g. \"objectClass=person\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\".",
"Group Filter" => "Group Filter",
+"Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
"Port" => "Θύρα",
"Base User Tree" => "Base User Tree",
"Base Group Tree" => "Base Group Tree",
"Group-Member association" => "Group-Member association",
"Use TLS" => "Χρήση TLS",
+"Do not use it for SSL connections, it will fail." => "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει.",
+"Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
+"Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.",
"Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
"User Display Name Field" => "Πεδίο Ονόματος Χρήστη",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud.",
"Group Display Name Field" => "Group Display Name Field",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud.",
"in bytes" => "σε bytes",
+"in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.",
"Help" => "Βοήθεια"
);
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index c89ceb8eee2..4931af79eaf 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo.",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 35dacef3f2f..06ca9cb294e 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
"Host" => "Hostalaria",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
"Base DN" => "Oinarrizko DN",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index a0b1c6b7d9c..9750d1352a8 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe.",
"Host" => "Hôte",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
"Base DN" => "DN Racine",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index f07f0aa5a42..915ce3af5b8 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index ffaae4e9bd2..c7b2a0f91b8 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。",
"Host" => "ホスト",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
"Base DN" => "ベースDN",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
new file mode 100644
index 00000000000..70a62e71765
--- /dev/null
+++ b/apps/user_ldap/l10n/mk.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Домаќин",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
+"Password" => "Лозинка"
+);
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 84c36881f9a..23e9a15c010 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
"Base DN" => "Basis DN",
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 7ebebe1e073..0a3dea14c94 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
"Base DN" => "Baza DN",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index a17e1a95923..1b21b899a2e 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar.",
"Host" => "Anfitrião",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index beeed857455..b4d7d4902fe 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia",
"Host" => "Gazdă",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
"Base DN" => "DN de bază",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 92982d868b8..f41a0b05838 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Внимание:</b> Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
"Host" => "Сервер",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
"Base DN" => "Базовый DN",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index d5adb9fffd3..09d7899249a 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
"Host" => "Хост",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
"Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 098224bb319..1d1fc33a83b 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti.",
"Host" => "Gostitelj",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
"Base DN" => "Osnovni DN",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 2a0abb92967..e8e14af7aca 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den.",
"Host" => "Server",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
"Base DN" => "Start DN",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
new file mode 100644
index 00000000000..6da65d9832b
--- /dev/null
+++ b/apps/user_ldap/l10n/tr.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Konak",
+"Base DN" => "Base DN",
+"User DN" => "User DN",
+"Password" => "Parola",
+"For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
+"User Login Filter" => "Kullanıcı Oturum Açma Süzgeci",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"",
+"User List Filter" => "Kullanıcı Liste Süzgeci",
+"without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"",
+"Group Filter" => "Grup Süzgeci",
+"Port" => "Port",
+"Base User Tree" => "Temel Kullanıcı Ağacı",
+"Base Group Tree" => "Temel Grup Ağacı",
+"Group-Member association" => "Grup-Üye işbirliği",
+"Use TLS" => "TLS kullan",
+"Do not use it for SSL connections, it will fail." => "SSL bağlantıları ile kullanmayın, başarısız olacaktır.",
+"Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
+"Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
+"in bytes" => "byte cinsinden",
+"in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
+"Help" => "Yardım"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 1bbd24f679b..f82e9f2a420 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,4 +1,6 @@
<?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
"Host" => "Хост",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
"Base DN" => "Базовий DN",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 00183ac181b..f888577aedb 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -133,7 +133,7 @@ abstract class Access {
'\"' => '\5c22',
'\#' => '\5c23',
);
- $dn = str_replace(array_keys($replacements),array_values($replacements), $dn);
+ $dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
return $dn;
}
@@ -347,20 +347,20 @@ abstract class Access {
}
private function findMappedGroup($dn) {
- static $query = null;
+ static $query = null;
if(is_null($query)) {
$query = \OCP\DB::prepare('
- SELECT `owncloud_name`
- FROM `'.$this->getMapTable(false).'`
- WHERE `ldap_dn` = ?'
- );
- }
- $res = $query->execute(array($dn))->fetchOne();
- if($res) {
- return $res;
- }
+ SELECT `owncloud_name`
+ FROM `'.$this->getMapTable(false).'`
+ WHERE `ldap_dn` = ?'
+ );
+ }
+ $res = $query->execute(array($dn))->fetchOne();
+ if($res) {
+ return $res;
+ }
return false;
- }
+ }
private function ldap2ownCloudNames($ldapObjects, $isUsers) {
@@ -619,7 +619,7 @@ abstract class Access {
//a) paged search insuccessful, though attempted
//b) no paged search, but limit set
if((!$this->pagedSearchedSuccessful
- && $pagedSearchOK)
+ && $pagedSearchOK)
|| (
!$pagedSearchOK
&& !is_null($limit)
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 687e2692270..b14cdafff89 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -338,11 +338,11 @@ class Connection {
}
$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
- if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
- if($this->config['ldapTLS']) {
- ldap_start_tls($this->ldapConnectionRes);
- }
+ if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
+ if($this->config['ldapTLS']) {
+ ldap_start_tls($this->ldapConnectionRes);
}
+ }
}
return $this->bind();
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 2ee936d29a8..58ec8e7f7a4 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,6 +20,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
+OC_Util::checkAdminUser();
+
$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl', 'home_folder_naming_rule');
OCP\Util::addscript('user_ldap', 'settings');
diff --git a/apps/user_webdavauth/l10n/ar.php b/apps/user_webdavauth/l10n/ar.php
index 9bd32954b05..cf59cd2519e 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "الرابط: http://"
);
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index a59bffb870d..84a6c599e78 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "Adreça WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarà les credencials d'usuari a aquesta URL. S'interpretarà http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
);
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index a5b7e56771f..5cb9b4c3704 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "URL WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud odešle přihlašovací údaje uživatele na URL a z návratové hodnoty určí stav přihlášení. Http 401 a 403 vyhodnotí jako neplatné údaje a všechny ostatní jako úspěšné přihlášení."
);
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
new file mode 100644
index 00000000000..7d9ee1d5b29
--- /dev/null
+++ b/apps/user_webdavauth/l10n/da.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
+);
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index 9bd32954b05..8589dc0c4fd 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
);
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 9bd32954b05..3d73dccfe8e 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud "
);
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 9bd32954b05..bf4c11af64c 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Το ownCloud θα στείλει τα συνθηματικά χρήστη σε αυτό το URL, μεταφράζοντας τα http 401 και http 403 ως λανθασμένα συνθηματικά και όλους τους άλλους κωδικούς ως σωστά συνθηματικά."
);
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index b4a2652d33e..245a5101341 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV-a URL: http://"
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index 9bd32954b05..bbda9f10ba0 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira."
);
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index a5b7e56771f..b0abf2f2082 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "URL WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud invierà le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
);
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 9bd32954b05..8643805ffcc 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloudのこのURLへのユーザ資格情報の送信は、資格情報が間違っている場合はHTTP401もしくは403を返し、正しい場合は全てのコードを返します。"
);
diff --git a/apps/user_webdavauth/l10n/mk.php b/apps/user_webdavauth/l10n/mk.php
new file mode 100644
index 00000000000..245a5101341
--- /dev/null
+++ b/apps/user_webdavauth/l10n/mk.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"URL: http://" => "URL: http://"
+);
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 9bd32954b05..687442fb665 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud zal de inloggegevens naar deze URL als geïnterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
);
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 9bd32954b05..245a5101341 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index 1aca5caeff1..e8bfcfda81e 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "Endereço WebDAV: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "O ownCloud vai enviar as credenciais para este URL. Todos os códigos http 401 e 403 serão interpretados como credenciais inválidas, todos os restantes códigos http serão interpretados como credenciais correctas."
);
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
new file mode 100644
index 00000000000..17157da044d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "owncloud va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte"
+);
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index 9bd32954b05..245a5101341 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/ru_RU.php b/apps/user_webdavauth/l10n/ru_RU.php
index 9bd32954b05..245a5101341 100644
--- a/apps/user_webdavauth/l10n/ru_RU.php
+++ b/apps/user_webdavauth/l10n/ru_RU.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index 9bd32954b05..b7a7e4ea2d9 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud kommer att skicka inloggningsuppgifterna till denna URL och tolkar http 401 och http 403 som fel och alla andra koder som korrekt."
);
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index 9bd32954b05..245a5101341 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://"
);
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 9bd32954b05..57aa90684ae 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud відправить облікові дані на цей URL та буде інтерпретувати http 401 і http 403, як невірні облікові дані, а всі інші коди, як вірні."
);
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 33c77f7d30e..5b06409b42e 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,3 +1,3 @@
<?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV地址: http://"
+"URL: http://" => "URL:http://"
);
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 497a3385caa..41d7fa51cd2 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -21,11 +21,13 @@
*
*/
+OC_Util::checkAdminUser();
+
if($_POST) {
- if(isset($_POST['webdav_url'])) {
- OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
- }
+ if(isset($_POST['webdav_url'])) {
+ OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
+ }
}
// fill template
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index e6ca5d97d3c..62ed45fd278 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,7 +1,8 @@
<form id="webdavauth" action="#" method="post">
<fieldset class="personalblock">
<legend><strong>WebDAV Authentication</strong></legend>
- <p><label for="webdav_url"><?php echo $l->t('WebDAV URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
+ <p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
<input type="submit" value="Save" />
+ <br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?>
</fieldset>
</form>
diff --git a/build/README.TXT b/build/README.TXT
new file mode 100644
index 00000000000..128571058d8
--- /dev/null
+++ b/build/README.TXT
@@ -0,0 +1,28 @@
+How to setup build.xml on your local machine?
+
+1.) Install ant
+ e.g. apt-get install ant
+
+2.) Install jslint
+ Get the latest distribution from http://code.google.com/p/jslint4java/ and
+ place jslint4java-*.jar in your home under .ant/lib/
+
+3.) Install PHP qa tools
+ Run as root:
+ pear config-set auto_discover 1
+ pear install pear.phpqatools.org/phpqatools pear.netpirates.net/phpDox
+
+ Alternative:
+ pear install pear.phpunit.de/phploc
+ pear install pear.phpunit.de/phpcpd
+ pear install pear.phpmd.org/PHP_PMD
+ pear install pear.pdepend.org/PHP_Depend
+ pear install pear.php.org/PHP_CodeSniffer
+ pear install PHP_CodeSniffer
+ pear install pear.phpqatools.org/PHP_CodeBrowser
+
+
+How to call this ant script?
+ ant -f build/build.xml -Dbasedir=.
+
+
diff --git a/build/build.xml b/build/build.xml
new file mode 100644
index 00000000000..3df77ad024e
--- /dev/null
+++ b/build/build.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ownCloud" default="build" xmlns:jsl="antlib:com.googlecode.jslint4java">
+
+ <!-- the target 'build' can be used by developers for command line builds -->
+ <target name="build" depends="prepare,lint,jslint,phploc,pdepend,phpmd,phpcs,phpcpd,phpdoc,phpunit"/>
+
+ <!-- the target 'build-ci' is used within our Jenkins CI-server http://ci.tmit.eu -->
+ <target name="build-ci" depends="prepare,lint,jslint-ci,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,phpdoc,phpunit,phpcb-ci"/>
+
+ <!-- the target 'build-pullrequests' is used within our Jenkins CI-server for pull request analysis -->
+ <target name="build-pullrequests" depends="prepare,lint,jslint-ci"/>
+
+ <target name="clean" description="Cleanup build artifacts">
+ <delete dir="${basedir}/build/api"/>
+ <delete dir="${basedir}/build/code-browser"/>
+ <delete dir="${basedir}/build/coverage"/>
+ <delete dir="${basedir}/build/logs"/>
+ <delete dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <target name="prepare" depends="clean"
+ description="Prepare for build">
+ <mkdir dir="${basedir}/build/api"/>
+ <mkdir dir="${basedir}/build/code-browser"/>
+ <mkdir dir="${basedir}/build/coverage"/>
+ <mkdir dir="${basedir}/build/logs"/>
+ <mkdir dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <!-- php syntax analysis -->
+ <target name="lint">
+ <apply executable="php" failonerror="true">
+ <arg value="-l" />
+
+ <fileset dir="${basedir}">
+ <include name="**/*.php" />
+ <exclude name="**/3rdparty/**" />
+ <exclude name="**/l10n/**" />
+ <!-- modified / -->
+ </fileset>
+
+ </apply>
+ </target>
+
+ <!-- javascript lint -->
+ <target name="jslint-ci" description="Run the JSLint tool on JS files">
+ <jsl:jslint options="white,sloppy,vars,bitwise,eqeq,browser" haltOnFailure="false">
+ <jsl:predef>
+jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileActions,localStorage,OCCategories,EventSource,OCdialog,SVGSupport,dragOptions,dragOptions,folderDropOptions,formatDate,humanFileSize,procesSelection,relative_modified_date,scanFiles,simpleFileSize,simpleSize
+</jsl:predef>
+ <!-- jsl:formatter type="plain" / -->
+ <jsl:formatter type="xml" destfile="build/logs/jslint.xml" />
+ <fileset dir="${basedir}" includes="**/*.js" excludes="**/*.min.js,**/3rdparty/**" />
+ </jsl:jslint>
+ </target>
+
+ <target name="jslint" description="Run the JSLint tool on JS files">
+ <jsl:jslint options="white,sloppy,vars,bitwise,eqeq,browser" haltOnFailure="false">
+ <jsl:predef>
+jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileActions,localStorage,OCCategories,EventSource,OCdialog,SVGSupport,dragOptions,dragOptions,folderDropOptions,formatDate,humanFileSize,procesSelection,relative_modified_date,scanFiles,simpleFileSize,simpleSize
+</jsl:predef>
+ <jsl:formatter type="plain" />
+ <fileset dir="${basedir}" includes="**/*.js" excludes="**/*.min.js,**/3rdparty/**" />
+ </jsl:jslint>
+ </target>
+
+ <target name="phploc" description="Measure project size using PHPLOC">
+ <exec executable="phploc">
+ <arg value="--log-csv" />
+ <arg value="${basedir}/build/logs/phploc.csv" />
+ <arg path="${basedir}" />
+ <arg value="--exclude" />
+ <arg value="${basedir}/3rdparty/" />
+ </exec>
+ </target>
+
+ <target name="pdepend"
+ description="Calculate software metrics using PHP_Depend">
+ <exec executable="pdepend">
+ <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
+ <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
+ <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
+ <arg value="--ignore=${basedir}/3rdparty/"/>
+ <arg path="${basedir}" />
+ </exec>
+ </target>
+
+ <target name="phpmd-ci"
+ description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
+ <exec executable="phpmd">
+ <arg path="${basedir}" />
+ <arg value="xml" />
+ <arg value="${basedir}/build/phpmd.xml" />
+ <arg value="--reportfile" />
+ <arg value="${basedir}/build/logs/pmd.xml" />
+ <arg value="--exclude" />
+ <arg value="${basedir}/3rdparty/" />
+ </exec>
+ </target>
+
+ <target name="phpmd"
+ description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
+ <exec executable="phpmd">
+ <arg path="${basedir}" />
+ <arg value="xml" />
+ <arg value="${basedir}/build/phpmd.xml" />
+ <arg value="--exclude" />
+ <arg value="${basedir}/3rdparty/" />
+ </exec>
+ </target>
+
+ <target name="phpcs-ci"
+ description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
+ <exec executable="phpcs" >
+ <arg value="-p" />
+ <arg value="-v" />
+ <arg value="--tab-width=4" />
+ <arg value="--report=checkstyle" />
+ <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
+ <arg value="--standard=${basedir}/build/phpcs.xml" />
+ <arg path="${basedir}" />
+ </exec>
+ </target>
+
+ <target name="phpcs"
+ description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
+ <exec executable="phpcs" >
+ <arg value="-p" />
+ <arg value="-v" />
+ <arg value="--tab-width=4" />
+ <arg value="--standard=${basedir}/build/phpcs.xml" />
+ <arg path="${basedir}" />
+ </exec>
+ </target>
+
+ <target name="phpcpd" description="Find duplicate code using PHPCPD">
+ <exec executable="phpcpd">
+ <arg value="--exclude" />
+ <arg value="${basedir}/3rdparty/" />
+ <arg path="${basedir}" />
+ </exec>
+ </target>
+
+ <target name="phpcpd-ci" description="Find duplicate code using PHPCPD">
+ <exec executable="phpcpd">
+ <arg value="--log-pmd" />
+ <arg value="${basedir}/build/logs/pmd-cpd.xml" />
+ <arg value="--exclude" />
+ <arg value="${basedir}/3rdparty/" />
+ <arg path="${basedir}" />
+ </exec>
+ </target>
+
+ <!-- No idea if we need this within this build file. This is part of the release which is not contained within this script. -->
+ <target name="phpdoc"
+ description="Generate API documentation using PHPDocumentor">
+ <!-- exec executable="phpdox"/ -->
+ </target>
+
+ <!-- currently we use autotest.sh for executing the unit tests against 3 different database setups -->
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+ <echo message="TODO: phpunit goes here"/>
+ <!-- exec executable="phpunit" failonerror="true"/ -->
+ </target>
+
+ <target name="phpcb-ci"
+ description="Aggregate tool output with PHP_CodeBrowser">
+ <exec executable="phpcb">
+ <arg value="--log" />
+ <arg path="${basedir}/build/logs" />
+ <arg value="--source" />
+ <arg path="${basedir}" />
+ <arg value="--output" />
+ <arg path="${basedir}/build/code-browser" />
+ <arg value="--exclude" />
+ <arg value="${basedir}/3rdparty/" />
+ </exec>
+ </target>
+</project>
diff --git a/build/phpcs.xml b/build/phpcs.xml
new file mode 100644
index 00000000000..1e10be1a111
--- /dev/null
+++ b/build/phpcs.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+ <description>The coding standard for PHP_CodeSniffer itself.</description>
+ <exclude-pattern>*/Tests/*</exclude-pattern>
+ <exclude-pattern>*/lib/MDB2/*</exclude-pattern>
+ <exclude-pattern>*/3rdparty/*</exclude-pattern>
+ <exclude-pattern>*.min.*</exclude-pattern>
+ <exclude-pattern>*/l10n/*</exclude-pattern>
+ <exclude-pattern>*/files_texteditor/js/aceeditor/*</exclude-pattern>
+ <exclude-pattern>*/files_pdfviewer/js/pdfjs/*</exclude-pattern>
+ <exclude-pattern>*/files_odfviewer/src/*</exclude-pattern>
+ <exclude-pattern>*/files_svgedit/svg-edit/*</exclude-pattern>
+ <exclude-pattern>*jquery-ui-1.8.16.custom.css</exclude-pattern>
+ <extensions>php</extensions>
+
+ <!-- Include the whole PEAR standard -->
+ <rule ref="PEAR">
+ <exclude name="PEAR.Commenting.FileComment.InvalidAuthors" />
+ <exclude name="PEAR.Commenting.FileComment.TagIndent" />
+ <exclude name="PEAR.Commenting.FileComment.MissingVersion" />
+ <exclude name="PEAR.Commenting.FileComment.MissingTag" />
+ <exclude name="PEAR.Commenting.ClassComment.TagIndent" />
+ <!-- exclude name="PEAR.WhiteSpace.ScopeIndent.Incorrect" /-->
+ <exclude name="PEAR.Commenting.ClassComment.WrongTagOrder" />
+ <exclude name="Generic.WhiteSpace.DisallowTabIndent.TabsUsed" />
+ <exclude name="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket" />
+ <exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket" />
+ <exclude name="Generic.ControlStructures.InlineControlStructure.Discouraged" />
+ <exclude name="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned" />
+ <exclude name="PEAR.Commenting.FunctionComment.MissingParamTag" />
+ <exclude name="PEAR.ControlStructures.ControlSignature" />
+
+ <!-- ident and alignment stuff -->
+ <!-- exclude name="PEAR.ControlStructures.MultiLineCondition.Alignment" />
+ <exclude name="PEAR.WhiteSpace.ScopeClosingBrace.BreakIdent" / -->
+
+ <!-- allow curly on classes and functions -->
+ <exclude name="PEAR.Functions.FunctionDeclaration.BraceOnSameLine" />
+ <exclude name="PEAR.Classes.ClassDeclaration.OpenBraceNewLine" />
+
+ <exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore" />
+ <exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore" />
+ <exclude name="PEAR.WhiteSpace.ScopeIndent"/>
+ </rule>
+
+ <rule ref="Zend.Files.ClosingTag" />
+
+ <rule ref="Generic.WhiteSpace.ScopeIndent">
+ <properties>
+ <property name="indent" value="4"/>
+ </properties>
+ </rule>
+
+ <rule ref="Generic.Files.LineLength">
+ <properties>
+ <property name="lineLimit" value="120"/>
+ <property name="absoluteLineLimit" value="160"/>
+ </properties>
+ </rule>
+
+ <!-- Include most of the Squiz standard -->
+ <!-- rule ref="Squiz">
+ <exclude name="Squiz.Classes.ClassFileName"/>
+ <exclude name="Squiz.Classes.ValidClassName"/>
+ <exclude name="Squiz.Commenting.ClassComment"/>
+ <exclude name="Squiz.Commenting.FileComment"/>
+ <exclude name="Squiz.Commenting.FunctionComment"/>
+ <exclude name="Squiz.Commenting.VariableComment"/>
+ <exclude name="Squiz.ControlStructures.SwitchDeclaration"/>
+ <exclude name="Squiz.Files.FileExtension"/>
+ <exclude name="Squiz.NamingConventions.ConstantCase"/>
+ <exclude name="Squiz.Operators.ComparisonOperatorUsage"/>
+</rule -->
+
+ <!-- We allow variables to be used inside double quoted strings -->
+ <!-- rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
+ <severity>0</severity>
+ </rule -->
+
+</ruleset>
diff --git a/build/phpmd.xml b/build/phpmd.xml
new file mode 100644
index 00000000000..3935a5b74b5
--- /dev/null
+++ b/build/phpmd.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+ <ruleset name="My first PHPMD rule set" xmlns="http://pmd.sf.net/ruleset/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:noNamespaceSchemaLocation=" http://pmd.sf.net/ruleset_xml_schema.xsd">
+ <description> My custom rule set that checks my code... </description>
+ <!-- Import the entire unused code rule set -->
+ <rule ref="rulesets/unusedcode.xml" />
+
+ <!-- Import the entire cyclomatic complexity rule -->
+ <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
+</ruleset>
diff --git a/config/config.sample.php b/config/config.sample.php
index f531d5f146b..78dfe17ea79 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -42,6 +42,12 @@ $CONFIG = array(
/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
"enhancedauthtime" => 15 * 60,
+/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
+"proxy" => "",
+
+/* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
+"proxyuserpwd" => "",
+
/* Theme to use for ownCloud */
"theme" => "",
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 12206e0fd79..72ffc52e997 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -89,12 +89,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if ($type === 'dir')
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
- // handle localhost installations
- $server_host = OCP\Util::getServerHost();
- if ($server_host === 'localhost')
- $server_host = "example.com";
- $default_from = 'sharing-noreply@' . $server_host;
+ $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
// send it out now
diff --git a/core/css/styles.css b/core/css/styles.css
index 0730eeac9fa..d635916b5ae 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -193,13 +193,11 @@ fieldset.warning legend { color:#b94a48 !important; }
#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
-tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
+tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
tr .action { width:16px; height:16px; }
.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-
-table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
tbody tr:hover, tr:active { background-color:#f8f8f8; }
#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
diff --git a/core/doc/admin/index.php b/core/doc/admin/index.php
new file mode 100644
index 00000000000..7785f2ce2f1
--- /dev/null
+++ b/core/doc/admin/index.php
@@ -0,0 +1,2 @@
+Here goes the admin documentation.
+In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
diff --git a/core/doc/user/index.php b/core/doc/user/index.php
new file mode 100644
index 00000000000..ede62f05aee
--- /dev/null
+++ b/core/doc/user/index.php
@@ -0,0 +1,2 @@
+Here goes the user documentation
+In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index eb2ea766c31..37f62543ac2 100644
--- a/core/img/actions/logout.png
+++ b/core/img/actions/logout.png
Binary files differ
diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg
index d95ac959778..0281fad43e7 100644
--- a/core/img/actions/logout.svg
+++ b/core/img/actions/logout.svg
@@ -11,11 +11,14 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
- width="18"
+ width="16"
height="16"
id="svg2403"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="system-shutdown-panel2.svg">
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="logout.svg"
+ inkscape:export-filename="logout.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -26,14 +29,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-height="745"
id="namedview3047"
showgrid="false"
- inkscape:zoom="17.875"
- inkscape:cx="9"
- inkscape:cy="8"
+ inkscape:zoom="25.279067"
+ inkscape:cx="5.0341304"
+ inkscape:cy="6.4537904"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg2403" />
<metadata
@@ -67,7 +70,7 @@
id="linearGradient2395"
xlink:href="#linearGradient3678"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)" />
<linearGradient
id="linearGradient3678">
<stop
@@ -79,17 +82,96 @@
style="stop-color:#e6e6e6;stop-opacity:1"
offset="1" />
</linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3879"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3908"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)"
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3914"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3916"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)"
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3919"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)"
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3922"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3925"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="15.216674" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3678"
+ id="linearGradient3942"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,-0.42098964,0.06024281)"
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="15.216674" />
</defs>
<path
- d="M 5.8427514,4.45 C 0.60889,7.192151 2.9756281,15.05 8.959192,15.05 c 5.921233,0 8.575036,-7.449605 3.11644,-10.6 M 9,8 9,1.9996319"
- id="path3341-5"
- style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+ id="path3927"
+ d="m 8.0000634,1 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,13.733393 4.5611725,16 7.9688134,16 11.327833,16 13.846204,13.850562 14.687563,11.21875 15.528922,8.5869378 14.630363,5.3955638 11.562563,3.625 11.128957,3.3713639 10.503661,3.535122 10.250038,3.9687356 9.9964154,4.4023491 10.160192,5.0276401 10.593813,5.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,8.5564313 3.0469519,6.451888 5.2813134,5.28125 5.6599659,5.0748887 5.8603711,4.5887067 5.7371222,4.1754605 5.6138734,3.7622144 5.1798937,3.4652349 4.7500634,3.5 4.7188384,3.49846 4.6875384,3.49846 4.6563134,3.5 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sccsccsccssscscssscscc" />
<path
- d="M 9,7 9,0.99963191"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3942);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 8.0000634,0 c -0.4714045,0 -1.0110304,0.54190231 -1,1 l 0,6 c -0.00747,0.5283126 0.4716346,1 1,1 0.5283654,0 1.007472,-0.4716874 1,-1 l 0,-6 c 0.014622,-0.60510499 -0.5285955,-1 -1,-1 z m -3.34375,2.5 a 0.95009499,0.95009499 0 0 0 -0.25,0.09375 C 1.4068135,4.1652633 0.48788466,7.3916066 1.2813134,10.0625 2.0747421,12.733393 4.5611725,15 7.9688134,15 c 3.3590196,0 5.8773906,-2.149438 6.7187496,-4.78125 0.841359,-2.6318122 -0.0572,-5.8231862 -3.125,-7.59375 a 0.95938009,0.95938009 0 1 0 -0.96875,1.65625 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 -0.577366,-1.9435687 -0.046862,-4.048112 2.1875,-5.21875 A 0.95009499,0.95009499 0 0 0 4.7500634,2.5 a 0.95009499,0.95009499 0 0 0 -0.09375,0 z"
id="path3716"
- style="fill:none;stroke:url(#linearGradient2395);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
- <path
- d="M 5.8427514,3.45 C 0.60889,6.1921513 2.9756281,14.05 8.959192,14.05 c 5.921233,0 8.575036,-7.4496051 3.11644,-10.6"
- id="path3341"
- style="fill:none;stroke:url(#linearGradient2392);stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+ inkscape:connector-curvature="0" />
</svg>
diff --git a/core/js/share.js b/core/js/share.js
index df5ebf008b4..bb3ec010ff5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -161,9 +161,9 @@ OC.Share={
if (link) {
html += '<div id="link">';
html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
- html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
html += '<br />';
html += '<input id="linkText" type="text" readonly="readonly" />';
+ html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
html += '<div id="linkPass">';
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
html += '</div>';
@@ -347,9 +347,12 @@ OC.Share={
}
$('#linkText').val(link);
$('#linkText').show('blind');
+ $('#linkText').css('display','block');
$('#showPassword').show();
+ $('#showPassword+label').show();
if (password != null) {
$('#linkPass').show('blind');
+ $('#showPassword').attr('checked', true);
$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
}
$('#expiration').show();
@@ -359,6 +362,7 @@ OC.Share={
hideLink:function() {
$('#linkText').hide('blind');
$('#showPassword').hide();
+ $('#showPassword+label').hide();
$('#linkPass').hide();
$('#emailPrivateLink #email').hide();
$('#emailPrivateLink #emailButton').hide();
@@ -518,16 +522,25 @@ $(document).ready(function() {
$('#showPassword').live('click', function() {
$('#linkPass').toggle('blind');
+ if (!$('#showPassword').is(':checked') ) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+ } else {
+ $('#linkPassText').focus();
+ }
});
- $('#linkPassText').live('focusout', function(event) {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
- $('#linkPassText').val('');
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
- });
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ $('#linkPassText').live('focusout keyup', function(event) {
+ if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
+ console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
+ $('#linkPassText').val('');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ });
+ }
});
$('#expirationCheckbox').live('click', function() {
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 80a22a248e6..d33de577b3d 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,10 +1,48 @@
<?php $TRANSLATIONS = array(
+"No category to add?" => "ألا توجد فئة للإضافة؟",
+"This category already exists: " => "هذه الفئة موجودة مسبقاً",
+"No categories selected for deletion." => "لم يتم اختيار فئة للحذف",
"Settings" => "تعديلات",
+"seconds ago" => "منذ ثواني",
+"1 minute ago" => "منذ دقيقة",
+"{minutes} minutes ago" => "{minutes} منذ دقائق",
+"today" => "اليوم",
+"Choose" => "اختيار",
"Cancel" => "الغاء",
+"No" => "لا",
+"Yes" => "نعم",
+"Ok" => "موافق",
+"Error" => "خطأ",
+"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" => "شارك مع",
+"Share with link" => "شارك مع رابط",
+"Password protect" => "حماية كلمة السر",
"Password" => "كلمة السر",
+"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
+"Expiration date" => "تاريخ إنتهاء الصلاحية",
+"Share via email:" => "مشاركة عبر البريد الإلكتروني:",
+"No people found" => "لم يتم العثور على أي شخص",
+"Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة",
+"Shared in {item} with {user}" => "شورك في {item} مع {user}",
"Unshare" => "إلغاء مشاركة",
+"can edit" => "التحرير مسموح",
+"access control" => "ضبط الوصول",
+"create" => "إنشاء",
+"update" => "تحديث",
+"delete" => "حذف",
+"share" => "مشاركة",
+"Password protected" => "محمي بكلمة السر",
+"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+"ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+"Reset email send." => "إعادة إرسال البريد الإلكتروني.",
+"Request failed!" => "فشل الطلب",
"Username" => "إسم المستخدم",
"Request reset" => "طلب تعديل",
"Your password was reset" => "لقد تم تعديل كلمة السر",
@@ -16,9 +54,12 @@
"Apps" => "التطبيقات",
"Admin" => "مستخدم رئيسي",
"Help" => "المساعدة",
+"Access forbidden" => "التوصّل محظور",
"Cloud not found" => "لم يتم إيجاد",
"Edit categories" => "عدل الفئات",
"Add" => "أدخل",
+"Security Warning" => "تحذير أمان",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.",
"Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
"Advanced" => "خيارات متقدمة",
"Data folder" => "مجلد المعلومات",
@@ -27,6 +68,7 @@
"Database user" => "مستخدم قاعدة البيانات",
"Database password" => "كلمة سر مستخدم قاعدة البيانات",
"Database name" => "إسم قاعدة البيانات",
+"Database tablespace" => "مساحة جدول قاعدة البيانات",
"Database host" => "خادم قاعدة البيانات",
"Finish setup" => "انهاء التعديلات",
"Sunday" => "الاحد",
@@ -50,10 +92,16 @@
"December" => "كانون الاول",
"web services under your control" => "خدمات الوب تحت تصرفك",
"Log out" => "الخروج",
+"Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!",
+"If you did not change your password recently, your account may be compromised!" => "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً",
+"Please change your password to secure your account again." => "الرجاء إعادة تعيين كلمة السر لتأمين حسابك.",
"Lost your password?" => "هل نسيت كلمة السر؟",
"remember" => "تذكر",
"Log in" => "أدخل",
"You are logged out." => "تم الخروج بنجاح.",
"prev" => "السابق",
-"next" => "التالي"
+"next" => "التالي",
+"Security Warning!" => "تحذير أمان!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.",
+"Verify" => "تحقيق"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index cf7cdfb7c94..f98922f8f38 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -33,7 +33,7 @@
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
-"The required file {file} is not installed!" => "El figtxer requerit {file} no està instal·lat!",
+"The required file {file} is not installed!" => "El fitxer requerit {file} no està instal·lat!",
"Error while sharing" => "Error en compartir",
"Error while unsharing" => "Error en deixar de compartir",
"Error while changing permissions" => "Error en canviar els permisos",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 2798b22830f..a792e1d9bae 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,15 +1,27 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Bruger %s delte en fil med dig",
+"User %s shared a folder with you" => "Bruger %s delte en mappe med dig",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s",
+"Category type not provided." => "Kategori typen ikke er fastsat.",
"No category to add?" => "Ingen kategori at tilføje?",
"This category already exists: " => "Denne kategori eksisterer allerede: ",
+"Object type not provided." => "Object type ikke er fastsat.",
+"%s ID not provided." => "%s ID ikke oplyst.",
+"Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.",
"No categories selected for deletion." => "Ingen kategorier valgt",
+"Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.",
"Settings" => "Indstillinger",
"seconds ago" => "sekunder siden",
"1 minute ago" => "1 minut siden",
"{minutes} minutes ago" => "{minutes} minutter siden",
+"1 hour ago" => "1 time siden",
+"{hours} hours ago" => "{hours} timer siden",
"today" => "i dag",
"yesterday" => "i går",
"{days} days ago" => "{days} dage siden",
"last month" => "sidste måned",
+"{months} months ago" => "{months} måneder siden",
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "år siden",
@@ -18,7 +30,10 @@
"No" => "Nej",
"Yes" => "Ja",
"Ok" => "OK",
+"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
+"The app name is not specified." => "Den app navn er ikke angivet.",
+"The required file {file} is not installed!" => "Den krævede fil {file} er ikke installeret!",
"Error while sharing" => "Fejl under deling",
"Error while unsharing" => "Fejl under annullering af deling",
"Error while changing permissions" => "Fejl under justering af rettigheder",
@@ -28,6 +43,8 @@
"Share with link" => "Del med link",
"Password protect" => "Beskyt med adgangskode",
"Password" => "Kodeord",
+"Email link to person" => "E-mail link til person",
+"Send" => "Send",
"Set expiration date" => "Vælg udløbsdato",
"Expiration date" => "Udløbsdato",
"Share via email:" => "Del via email:",
@@ -44,9 +61,13 @@
"Password protected" => "Beskyttet med adgangskode",
"Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato",
"Error setting expiration date" => "Fejl under sætning af udløbsdato",
+"Sending ..." => "Sender ...",
+"Email sent" => "E-mail afsendt",
"ownCloud password reset" => "Nulstil ownCloud kodeord",
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
+"Reset email send." => "Reset-mail afsendt.",
+"Request failed!" => "Anmodningen mislykkedes!",
"Username" => "Brugernavn",
"Request reset" => "Anmod om nulstilling",
"Your password was reset" => "Dit kodeord blev nulstillet",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 50c17ed46ae..c5867eda8c3 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Dich freigegeben",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis für Dich freigegeben",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: " => "Kategorie existiert bereits:",
@@ -39,6 +43,8 @@
"Share with link" => "Über einen Link freigeben",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
+"Email link to person" => "Link per E-Mail verschicken",
+"Send" => "Senden",
"Set expiration date" => "Setze ein Ablaufdatum",
"Expiration date" => "Ablaufdatum",
"Share via email:" => "Über eine E-Mail freigeben:",
@@ -55,6 +61,8 @@
"Password protected" => "Durch ein Passwort geschützt",
"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
+"Sending ..." => "Sende ...",
+"Email sent" => "E-Mail wurde verschickt",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 51c0eaaf0f9..ed0bc0e0ffb 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Sie freigegeben",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis für Sie freigegeben",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: " => "Kategorie existiert bereits:",
@@ -39,6 +43,8 @@
"Share with link" => "Über einen Link freigeben",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
+"Email link to person" => "Link per E-Mail verschicken",
+"Send" => "Senden",
"Set expiration date" => "Setze ein Ablaufdatum",
"Expiration date" => "Ablaufdatum",
"Share via email:" => "Mittels einer E-Mail freigeben:",
@@ -55,6 +61,8 @@
"Password protected" => "Durch ein Passwort geschützt",
"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
+"Sending ..." => "Sende ...",
+"Email sent" => "Email gesendet",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index e01de9fdc2c..d8a5d7aef51 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Ο χρήστης %s διαμοιράστηκε ένα αρχείο με εσάς",
+"User %s shared a folder with you" => "Ο χρήστης %s διαμοιράστηκε ένα φάκελο με εσάς",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε το αρχείο \"%s\" μαζί σας. Είναι διαθέσιμο για λήψη εδώ: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s",
"Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
"No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
"This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη:",
@@ -39,6 +43,8 @@
"Share with link" => "Διαμοιρασμός με σύνδεσμο",
"Password protect" => "Προστασία συνθηματικού",
"Password" => "Συνθηματικό",
+"Email link to person" => "Αποστολή συνδέσμου με email ",
+"Send" => "Αποστολή",
"Set expiration date" => "Ορισμός ημ. λήξης",
"Expiration date" => "Ημερομηνία λήξης",
"Share via email:" => "Διαμοιρασμός μέσω email:",
@@ -55,6 +61,8 @@
"Password protected" => "Προστασία με συνθηματικό",
"Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
"Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
+"Sending ..." => "Αποστολή...",
+"Email sent" => "Το Email απεστάλη ",
"ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud",
"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 7b65652d67c..a605b27ed80 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "La uzanto %s kunhavigis dosieron kun vi",
+"User %s shared a folder with you" => "La uzanto %s kunhavigis dosierujon kun vi",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosieron “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
"Category type not provided." => "Ne proviziĝis tipon de kategorio.",
"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
"This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
@@ -39,6 +43,8 @@
"Share with link" => "Kunhavigi per ligilo",
"Password protect" => "Protekti per pasvorto",
"Password" => "Pasvorto",
+"Email link to person" => "Retpoŝti la ligilon al ulo",
+"Send" => "Sendi",
"Set expiration date" => "Agordi limdaton",
"Expiration date" => "Limdato",
"Share via email:" => "Kunhavigi per retpoŝto:",
@@ -55,6 +61,8 @@
"Password protected" => "Protektita per pasvorto",
"Error unsetting expiration date" => "Eraro dum malagordado de limdato",
"Error setting expiration date" => "Eraro dum agordado de limdato",
+"Sending ..." => "Sendante...",
+"Email sent" => "La retpoŝtaĵo sendiĝis",
"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 58693eda8bd..2a9f5682dfb 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "El usuario %s ha compartido un archivo contigo",
+"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s",
"Category type not provided." => "Tipo de categoria no proporcionado.",
"No category to add?" => "¿Ninguna categoría para añadir?",
"This category already exists: " => "Esta categoría ya existe: ",
@@ -39,6 +43,8 @@
"Share with link" => "Compartir con enlace",
"Password protect" => "Protegido por contraseña",
"Password" => "Contraseña",
+"Email link to person" => "Enviar un enlace por correo electrónico a una persona",
+"Send" => "Enviar",
"Set expiration date" => "Establecer fecha de caducidad",
"Expiration date" => "Fecha de caducidad",
"Share via email:" => "compartido via e-mail:",
@@ -55,6 +61,8 @@
"Password protected" => "Protegido por contraseña",
"Error unsetting expiration date" => "Error al eliminar la fecha de caducidad",
"Error setting expiration date" => "Error estableciendo fecha de caducidad",
+"Sending ..." => "Enviando...",
+"Email sent" => "Correo electrónico enviado",
"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 252b0369e55..4b4a23b8c70 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -30,6 +30,8 @@
"Share with link" => "Jaa linkillä",
"Password protect" => "Suojaa salasanalla",
"Password" => "Salasana",
+"Email link to person" => "Lähetä linkki sähköpostitse",
+"Send" => "Lähetä",
"Set expiration date" => "Aseta päättymispäivä",
"Expiration date" => "Päättymispäivä",
"Share via email:" => "Jaa sähköpostilla:",
@@ -45,6 +47,8 @@
"Password protected" => "Salasanasuojattu",
"Error unsetting expiration date" => "Virhe purettaessa eräpäivää",
"Error setting expiration date" => "Virhe päättymispäivää asettaessa",
+"Sending ..." => "Lähetetään...",
+"Email sent" => "Sähköposti lähetetty",
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index f02a7b0087c..082bace76ce 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "L'utilisateur %s a partagé un fichier avec vous",
+"User %s shared a folder with you" => "L'utilsateur %s a partagé un dossier avec vous",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le fichier \"%s\" avec vous. Vous pouvez le télécharger ici : %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le dossier \"%s\" avec vous. Il est disponible au téléchargement ici : %s",
"Category type not provided." => "Type de catégorie non spécifié.",
"No category to add?" => "Pas de catégorie à ajouter ?",
"This category already exists: " => "Cette catégorie existe déjà : ",
@@ -39,6 +43,8 @@
"Share with link" => "Partager via lien",
"Password protect" => "Protéger par un mot de passe",
"Password" => "Mot de passe",
+"Email link to person" => "Envoyez le lien par email",
+"Send" => "Envoyer",
"Set expiration date" => "Spécifier la date d'expiration",
"Expiration date" => "Date d'expiration",
"Share via email:" => "Partager via e-mail :",
@@ -55,6 +61,8 @@
"Password protected" => "Protégé par un mot de passe",
"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration",
"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
+"Sending ..." => "En cours d'envoi ...",
+"Email sent" => "Email envoyé",
"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d4ec0ab84c4..50addbd5278 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "המשתמש %s שיתף אתך קובץ",
+"User %s shared a folder with you" => "המשתמש %s שיתף אתך תיקייה",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
@@ -39,6 +43,8 @@
"Share with link" => "שיתוף עם קישור",
"Password protect" => "הגנה בססמה",
"Password" => "ססמה",
+"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
+"Send" => "שליחה",
"Set expiration date" => "הגדרת תאריך תפוגה",
"Expiration date" => "תאריך התפוגה",
"Share via email:" => "שיתוף באמצעות דוא״ל:",
@@ -55,6 +61,8 @@
"Password protected" => "מוגן בססמה",
"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+"Sending ..." => "מתבצעת שליחה ...",
+"Email sent" => "הודעת הדוא״ל נשלחה",
"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 0db292df597..e97deb9fb5f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -43,6 +43,7 @@
"Share with link" => "Condividi con collegamento",
"Password protect" => "Proteggi con password",
"Password" => "Password",
+"Email link to person" => "Invia collegamento via email",
"Send" => "Invia",
"Set expiration date" => "Imposta data di scadenza",
"Expiration date" => "Data di scadenza",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 72b5915701b..72615d36f62 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "ユーザ %s はあなたとファイルを共有しています",
+"User %s shared a folder with you" => "ユーザ %s はあなたとフォルダを共有しています",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s",
"Category type not provided." => "カテゴリタイプは提供されていません。",
"No category to add?" => "追加するカテゴリはありませんか?",
"This category already exists: " => "このカテゴリはすでに存在します: ",
@@ -39,6 +43,8 @@
"Share with link" => "URLリンクで共有",
"Password protect" => "パスワード保護",
"Password" => "パスワード",
+"Email link to person" => "メールリンク",
+"Send" => "送信",
"Set expiration date" => "有効期限を設定",
"Expiration date" => "有効期限",
"Share via email:" => "メール経由で共有:",
@@ -55,6 +61,8 @@
"Password protected" => "パスワード保護",
"Error unsetting expiration date" => "有効期限の未設定エラー",
"Error setting expiration date" => "有効期限の設定でエラー発生",
+"Sending ..." => "送信中...",
+"Email sent" => "メールを送信しました",
"ownCloud password reset" => "ownCloudのパスワードをリセットします",
"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
"You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 251abb015f9..401baf6efa0 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,18 +1,73 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Корисникот %s сподели датотека со Вас",
+"User %s shared a folder with you" => "Корисникот %s сподели папка со Вас",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s",
+"Category type not provided." => "Не беше доставен тип на категорија.",
"No category to add?" => "Нема категорија да се додаде?",
"This category already exists: " => "Оваа категорија веќе постои:",
+"Object type not provided." => "Не беше доставен тип на објект.",
+"%s ID not provided." => "%s ID не беше доставено.",
+"Error adding %s to favorites." => "Грешка при додавање %s во омилени.",
"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
+"Error removing %s from favorites." => "Грешка при бришење на %s од омилени.",
"Settings" => "Поставки",
+"seconds ago" => "пред секунди",
+"1 minute ago" => "пред 1 минута",
+"{minutes} minutes ago" => "пред {minutes} минути",
+"1 hour ago" => "пред 1 час",
+"{hours} hours ago" => "пред {hours} часови",
+"today" => "денеска",
+"yesterday" => "вчера",
+"{days} days ago" => "пред {days} денови",
+"last month" => "минатиот месец",
+"{months} months ago" => "пред {months} месеци",
+"months ago" => "пред месеци",
+"last year" => "минатата година",
+"years ago" => "пред години",
+"Choose" => "Избери",
"Cancel" => "Откажи",
"No" => "Не",
"Yes" => "Да",
"Ok" => "Во ред",
+"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
+"The app name is not specified." => "Името на апликацијата не е специфицирано.",
+"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!",
+"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" => "Сподели со",
+"Share with link" => "Сподели со врска",
+"Password protect" => "Заштити со лозинка",
"Password" => "Лозинка",
+"Email link to person" => "Прати врска по е-пошта на личност",
+"Send" => "Прати",
+"Set expiration date" => "Постави рок на траење",
+"Expiration date" => "Рок на траење",
+"Share via email:" => "Сподели по е-пошта:",
+"No people found" => "Не се најдени луѓе",
+"Resharing is not allowed" => "Повторно споделување не е дозволено",
+"Shared in {item} with {user}" => "Споделено во {item} со {user}",
+"Unshare" => "Не споделувај",
+"can edit" => "може да се измени",
+"access control" => "контрола на пристап",
"create" => "креирај",
+"update" => "ажурирај",
+"delete" => "избриши",
+"share" => "сподели",
+"Password protected" => "Заштитено со лозинка",
+"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
+"Error setting expiration date" => "Грешка при поставување на рок на траење",
+"Sending ..." => "Праќање...",
+"Email sent" => "Е-порака пратена",
"ownCloud password reset" => "ресетирање на лозинка за ownCloud",
"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+"Reset email send." => "Порката за ресетирање на лозинка пратена.",
+"Request failed!" => "Барањето не успеа!",
"Username" => "Корисничко име",
"Request reset" => "Побарајте ресетирање",
"Your password was reset" => "Вашата лозинка беше ресетирана",
@@ -28,6 +83,10 @@
"Cloud not found" => "Облакот не е најден",
"Edit categories" => "Уреди категории",
"Add" => "Додади",
+"Security Warning" => "Безбедносно предупредување",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
"Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
"Advanced" => "Напредно",
"Data folder" => "Фолдер со податоци",
@@ -36,6 +95,7 @@
"Database user" => "Корисник на база",
"Database password" => "Лозинка на база",
"Database name" => "Име на база",
+"Database tablespace" => "Табела во базата на податоци",
"Database host" => "Сервер со база",
"Finish setup" => "Заврши го подесувањето",
"Sunday" => "Недела",
@@ -59,10 +119,16 @@
"December" => "Декември",
"web services under your control" => "веб сервиси под Ваша контрола",
"Log out" => "Одјава",
+"Automatic logon rejected!" => "Одбиена автоматска најава!",
+"If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана",
+"Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
"Lost your password?" => "Ја заборавивте лозинката?",
"remember" => "запамти",
"Log in" => "Најава",
"You are logged out." => "Одјавени сте.",
"prev" => "претходно",
-"next" => "следно"
+"next" => "следно",
+"Security Warning!" => "Безбедносно предупредување.",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
+"Verify" => "Потврди"
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 89bb322773d..c3f5c887658 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Gebruiker %s deelde een bestand met u",
+"User %s shared a folder with you" => "Gebruiker %s deelde een map met u",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s",
"Category type not provided." => "Categorie type niet opgegeven.",
"No category to add?" => "Geen categorie toevoegen?",
"This category already exists: " => "Deze categorie bestaat al.",
@@ -39,6 +43,8 @@
"Share with link" => "Deel met link",
"Password protect" => "Wachtwoord beveiliging",
"Password" => "Wachtwoord",
+"Email link to person" => "E-mail link naar persoon",
+"Send" => "Versturen",
"Set expiration date" => "Stel vervaldatum in",
"Expiration date" => "Vervaldatum",
"Share via email:" => "Deel via email:",
@@ -55,6 +61,8 @@
"Password protected" => "Wachtwoord beveiligd",
"Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
"Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
+"Sending ..." => "Versturen ...",
+"Email sent" => "E-mail verzonden",
"ownCloud password reset" => "ownCloud wachtwoord herstellen",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index b780e546194..1208aec5a53 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Użytkownik %s współdzieli plik z tobą",
+"User %s shared a folder with you" => "Uzytkownik %s wspóldzieli folder z toba",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
"Category type not provided." => "Typ kategorii nie podany.",
"No category to add?" => "Brak kategorii",
"This category already exists: " => "Ta kategoria już istnieje",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 24017d39819..a2bfcf4f882 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "O utilizador %s partilhou um ficheiro consigo.",
+"User %s shared a folder with you" => "O utilizador %s partilhou uma pasta consigo.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s",
"Category type not provided." => "Tipo de categoria não fornecido",
"No category to add?" => "Nenhuma categoria para adicionar?",
"This category already exists: " => "Esta categoria já existe:",
@@ -39,6 +43,8 @@
"Share with link" => "Partilhar com link",
"Password protect" => "Proteger com palavra-passe",
"Password" => "Palavra chave",
+"Email link to person" => "Enviar o link por e-mail",
+"Send" => "Enviar",
"Set expiration date" => "Especificar data de expiração",
"Expiration date" => "Data de expiração",
"Share via email:" => "Partilhar via email:",
@@ -55,6 +61,8 @@
"Password protected" => "Protegido com palavra-passe",
"Error unsetting expiration date" => "Erro ao retirar a data de expiração",
"Error setting expiration date" => "Erro ao aplicar a data de expiração",
+"Sending ..." => "A Enviar...",
+"Email sent" => "E-mail enviado com sucesso!",
"ownCloud password reset" => "Reposição da password ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 560ef5b9fc8..1c58e5fe2be 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,12 +1,17 @@
<?php $TRANSLATIONS = array(
+"Category type not provided." => "Tipul de categorie nu este prevazut",
"No category to add?" => "Nici o categorie de adăugat?",
"This category already exists: " => "Această categorie deja există:",
+"Object type not provided." => "Tipul obiectului nu este prevazut",
"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.",
"Settings" => "Configurări",
"seconds ago" => "secunde în urmă",
"1 minute ago" => "1 minut în urmă",
+"{minutes} minutes ago" => "{minutes} minute in urma",
+"1 hour ago" => "Acum o ora",
"today" => "astăzi",
"yesterday" => "ieri",
+"{days} days ago" => "{days} zile in urma",
"last month" => "ultima lună",
"months ago" => "luni în urmă",
"last year" => "ultimul an",
@@ -20,14 +25,18 @@
"Error while sharing" => "Eroare la partajare",
"Error while unsharing" => "Eroare la anularea partajării",
"Error while changing permissions" => "Eroare la modificarea permisiunilor",
+"Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
+"Shared with you by {owner}" => "Distribuie cu tine de {owner}",
"Share with" => "Partajat cu",
"Share with link" => "Partajare cu legătură",
"Password protect" => "Protejare cu parolă",
"Password" => "Parola",
"Set expiration date" => "Specifică data expirării",
"Expiration date" => "Data expirării",
+"Share via email:" => "Distribuie prin email:",
"No people found" => "Nici o persoană găsită",
"Resharing is not allowed" => "Repartajarea nu este permisă",
+"Shared in {item} with {user}" => "Distribuie in {item} si {user}",
"Unshare" => "Anulare partajare",
"can edit" => "poate edita",
"access control" => "control acces",
@@ -41,6 +50,8 @@
"ownCloud password reset" => "Resetarea parolei ownCloud ",
"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
+"Reset email send." => "Resetarea emailu-lui trimisa.",
+"Request failed!" => "Solicitarea nu a reusit",
"Username" => "Utilizator",
"Request reset" => "Cerere trimisă",
"Your password was reset" => "Parola a fost resetată",
@@ -57,6 +68,8 @@
"Edit categories" => "Editează categoriile",
"Add" => "Adaugă",
"Security Warning" => "Avertisment de securitate",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau",
"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
"Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
"Advanced" => "Avansat",
@@ -90,10 +103,16 @@
"December" => "Decembrie",
"web services under your control" => "servicii web controlate de tine",
"Log out" => "Ieșire",
+"Automatic logon rejected!" => "Logare automata respinsa",
+"If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis",
+"Please change your password to secure your account again." => "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou.",
"Lost your password?" => "Ai uitat parola?",
"remember" => "amintește",
"Log in" => "Autentificare",
"You are logged out." => "Ai ieșit",
"prev" => "precedentul",
-"next" => "următorul"
+"next" => "următorul",
+"Security Warning!" => "Advertisment de Securitate",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou",
+"Verify" => "Verifica"
);
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 7dea4062809..c18fe245c9e 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Пользователь %s открыл Вам доступ к файлу",
+"User %s shared a folder with you" => "Пользователь %s открыл Вам доступ к папке",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s",
"Category type not provided." => "Тип категории не предоставлен.",
"No category to add?" => "Нет категории для добавления?",
"This category already exists: " => "Эта категория уже существует:",
@@ -39,6 +43,8 @@
"Share with link" => "Опубликовать с ссылкой",
"Password protect" => "Защитить паролем",
"Password" => "Пароль",
+"Email link to person" => "Ссылка на адрес электронной почты",
+"Send" => "Отправить",
"Set expiration date" => "Установить срок действия",
"Expiration date" => "Дата истечения срока действия",
"Share via email:" => "Сделать общедоступным посредством email:",
@@ -55,6 +61,8 @@
"Password protected" => "Пароль защищен",
"Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия",
"Error setting expiration date" => "Ошибка при установке даты истечения срока действия",
+"Sending ..." => "Отправка ...",
+"Email sent" => "Письмо отправлено",
"ownCloud password reset" => "Переназначение пароля",
"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2aa4193263d..0ee2eb03b3c 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami",
+"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s",
"Category type not provided." => "Vrsta kategorije ni podana.",
"No category to add?" => "Ni kategorije za dodajanje?",
"This category already exists: " => "Ta kategorija že obstaja:",
@@ -39,6 +43,8 @@
"Share with link" => "Omogoči souporabo s povezavo",
"Password protect" => "Zaščiti z geslom",
"Password" => "Geslo",
+"Email link to person" => "Posreduj povezavo po e-pošti",
+"Send" => "Pošlji",
"Set expiration date" => "Nastavi datum preteka",
"Expiration date" => "Datum preteka",
"Share via email:" => "Souporaba preko elektronske pošte:",
@@ -55,6 +61,8 @@
"Password protected" => "Zaščiteno z geslom",
"Error unsetting expiration date" => "Napaka brisanja datuma preteka",
"Error setting expiration date" => "Napaka med nastavljanjem datuma preteka",
+"Sending ..." => "Pošiljam ...",
+"Email sent" => "E-pošta je bila poslana",
"ownCloud password reset" => "Ponastavitev gesla ownCloud",
"Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}",
"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index b06ccb199c6..a7698fb30ce 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Användare %s delade en fil med dig",
+"User %s shared a folder with you" => "Användare %s delade en mapp med dig",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Användare %s delade filen \"%s\" med dig. Den finns att ladda ner här: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Användare %s delade mappen \"%s\" med dig. Den finns att ladda ner här: %s",
"Category type not provided." => "Kategorityp inte angiven.",
"No category to add?" => "Ingen kategori att lägga till?",
"This category already exists: " => "Denna kategori finns redan:",
@@ -39,6 +43,8 @@
"Share with link" => "Delad med länk",
"Password protect" => "Lösenordsskydda",
"Password" => "Lösenord",
+"Email link to person" => "E-posta länk till person",
+"Send" => "Skicka",
"Set expiration date" => "Sätt utgångsdatum",
"Expiration date" => "Utgångsdatum",
"Share via email:" => "Dela via e-post:",
@@ -55,6 +61,8 @@
"Password protected" => "Lösenordsskyddad",
"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum",
"Error setting expiration date" => "Fel vid sättning av utgångsdatum",
+"Sending ..." => "Skickar ...",
+"Email sent" => "E-post skickat",
"ownCloud password reset" => "ownCloud lösenordsåterställning",
"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index cb0df023993..86036e5ebd1 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,25 +1,57 @@
<?php $TRANSLATIONS = array(
+"Category type not provided." => "Kategori türü desteklenmemektedir.",
"No category to add?" => "Eklenecek kategori yok?",
"This category already exists: " => "Bu kategori zaten mevcut: ",
+"Object type not provided." => "Nesne türü desteklenmemektedir.",
"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
"Settings" => "Ayarlar",
+"seconds ago" => "saniye önce",
+"1 minute ago" => "1 dakika önce",
+"{minutes} minutes ago" => "{minutes} dakika önce",
+"1 hour ago" => "1 saat önce",
+"{hours} hours ago" => "{hours} saat önce",
+"today" => "bugün",
+"yesterday" => "dün",
+"{days} days ago" => "{days} gün önce",
+"last month" => "geçen ay",
+"{months} months ago" => "{months} ay önce",
+"months ago" => "ay önce",
+"last year" => "geçen yıl",
+"years ago" => "yıl önce",
"Choose" => "seç",
"Cancel" => "İptal",
"No" => "Hayır",
"Yes" => "Evet",
"Ok" => "Tamam",
+"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
"Error while sharing" => "Paylaşım sırasında hata ",
+"Error while changing permissions" => "İzinleri değiştirirken hata oluştu",
"Share with" => "ile Paylaş",
"Share with link" => "Bağlantı ile paylaş",
"Password protect" => "Şifre korunması",
"Password" => "Parola",
+"Send" => "Gönder",
"Set expiration date" => "Son kullanma tarihini ayarla",
+"Expiration date" => "Son kullanım tarihi",
+"Share via email:" => "Eposta ile paylaş",
+"No people found" => "Kişi bulunamadı",
+"Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
"Unshare" => "Paylaşılmayan",
+"can edit" => "düzenleyebilir",
+"access control" => "erişim kontrolü",
"create" => "oluştur",
+"update" => "güncelle",
+"delete" => "sil",
+"share" => "paylaş",
+"Password protected" => "Paralo korumalı",
+"Sending ..." => "Gönderiliyor...",
+"Email sent" => "Eposta gönderildi",
"ownCloud password reset" => "ownCloud parola sıfırlama",
"Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
+"Reset email send." => "Sıfırlama epostası gönderildi.",
+"Request failed!" => "İstek reddedildi!",
"Username" => "Kullanıcı adı",
"Request reset" => "Sıfırlama iste",
"Your password was reset" => "Parolanız sıfırlandı",
@@ -68,10 +100,13 @@
"December" => "Aralık",
"web services under your control" => "kontrolünüzdeki web servisleri",
"Log out" => "Çıkış yap",
+"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
"Lost your password?" => "Parolanızı mı unuttunuz?",
"remember" => "hatırla",
"Log in" => "Giriş yap",
"You are logged out." => "Çıkış yaptınız.",
"prev" => "önceki",
-"next" => "sonraki"
+"next" => "sonraki",
+"Security Warning!" => "Güvenlik Uyarısı!",
+"Verify" => "Doğrula"
);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index a83382904d3..64b108ca1dd 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "用户 %s 与您共享了一个文件",
+"User %s shared a folder with you" => "用户 %s 与您共享了一个文件夹",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件\"%s\"。文件下载地址:%s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址:%s",
"Category type not provided." => "未提供分类类型。",
"No category to add?" => "没有可添加分类?",
"This category already exists: " => "此分类已存在: ",
@@ -39,6 +43,7 @@
"Share with link" => "共享链接",
"Password protect" => "密码保护",
"Password" => "密码",
+"Send" => "发送",
"Set expiration date" => "设置过期日期",
"Expiration date" => "过期日期",
"Share via email:" => "通过Email共享",
@@ -55,6 +60,8 @@
"Password protected" => "密码已受保护",
"Error unsetting expiration date" => "取消设置过期日期时出错",
"Error setting expiration date" => "设置过期日期时出错",
+"Sending ..." => "正在发送...",
+"Email sent" => "邮件已发送",
"ownCloud password reset" => "重置 ownCloud 密码",
"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码:{link}",
"You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 523520dc754..e64b16d3b83 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -43,7 +43,7 @@ class OC_Core_LostPassword_Controller {
$tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage();
$l = OC_L10N::get('core');
- $from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
+ $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
echo('Mailsent');
diff --git a/core/templates/login.php b/core/templates/login.php
index 153d1b50a30..10093baabf7 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,32 +1,50 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form method="post">
- <fieldset>
- <?php if(!empty($_['redirect_url'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect_url'].'" />'; } ?>
- <ul>
- <?php if(isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
- <li class="errors">
- <?php echo $l->t('Automatic logon rejected!'); ?><br>
- <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small><br>
- <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
- </li>
- <?php endif; ?>
- <?php if(isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
- <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>"><li class="errors">
- <?php echo $l->t('Lost your password?'); ?>
- </li></a>
- <?php endif; ?>
- </ul>
- <p class="infield grouptop">
- <input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
- <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
- </p>
- <p class="infield groupbottom">
- <input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
- <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
- <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
- </p>
- <input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
- <input type="submit" id="submit" class="login primary" value="<?php echo $l->t( 'Log in' ); ?>" />
- </fieldset>
+ <fieldset>
+ <?php if (!empty($_['redirect_url'])) {
+ echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
+ } ?>
+ <ul>
+ <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+ <li class="errors">
+ <?php echo $l->t('Automatic logon rejected!'); ?><br>
+ <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+ <br>
+ <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+ </li>
+ <?php endif; ?>
+ <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+ <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+ <li class="errors">
+ <?php echo $l->t('Lost your password?'); ?>
+ </li>
+ </a>
+ <?php endif; ?>
+ </ul>
+ <p class="infield grouptop">
+ <input type="text" name="user" id="user"
+ value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+ autocomplete="on" required/>
+ <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
+ </p>
+
+ <p class="infield groupbottom">
+ <input type="password" name="password" id="password" value=""
+ required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+ <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+ <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+ </p>
+ <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+ for="remember_login"><?php echo $l->t('remember'); ?></label>
+ <input type="hidden" name="timezone-offset" id="timezone-offset"/>
+ <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+ </fieldset>
</form>
+<script>
+ $(document).ready(function () {
+ var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+ $('#timezone-offset').val(visitortimezone);
+ });
+
+</script>
diff --git a/core/templates/logout.php b/core/templates/logout.php
index 8cbbdd9cc8d..2247ed8e70f 100644
--- a/core/templates/logout.php
+++ b/core/templates/logout.php
@@ -1 +1 @@
-<?php echo $l->t( 'You are logged out.' ); ?> \ No newline at end of file
+<?php echo $l->t( 'You are logged out.' );
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 4671747f750..0785bd05e65 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <shiningmoon25@gmail.com>, 2012.
# <tarek.taha@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 19:06+0000\n"
+"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,11 +49,11 @@ msgstr ""
#: ajax/vcategories/add.php:30
msgid "No category to add?"
-msgstr ""
+msgstr "ألا توجد فئة للإضافة؟"
#: ajax/vcategories/add.php:37
msgid "This category already exists: "
-msgstr ""
+msgstr "هذه الفئة موجودة مسبقاً"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -73,7 +74,7 @@ msgstr ""
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr ""
+msgstr "لم يتم اختيار فئة للحذف"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
@@ -86,15 +87,15 @@ msgstr "تعديلات"
#: js/js.js:704
msgid "seconds ago"
-msgstr ""
+msgstr "منذ ثواني"
#: js/js.js:705
msgid "1 minute ago"
-msgstr ""
+msgstr "منذ دقيقة"
#: js/js.js:706
msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} منذ دقائق"
#: js/js.js:707
msgid "1 hour ago"
@@ -106,7 +107,7 @@ msgstr ""
#: js/js.js:709
msgid "today"
-msgstr ""
+msgstr "اليوم"
#: js/js.js:710
msgid "yesterday"
@@ -138,7 +139,7 @@ msgstr ""
#: js/oc-dialogs.js:126
msgid "Choose"
-msgstr ""
+msgstr "اختيار"
#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
msgid "Cancel"
@@ -146,15 +147,15 @@ msgstr "الغاء"
#: js/oc-dialogs.js:162
msgid "No"
-msgstr ""
+msgstr "لا"
#: js/oc-dialogs.js:163
msgid "Yes"
-msgstr ""
+msgstr "نعم"
#: js/oc-dialogs.js:180
msgid "Ok"
-msgstr ""
+msgstr "موافق"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -162,10 +163,10 @@ msgid "The object type is not specified."
msgstr ""
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
-msgstr ""
+msgstr "خطأ"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
@@ -175,39 +176,39 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
-msgstr ""
+msgstr "حصل خطأ عند عملية المشاركة"
#: js/share.js:135
msgid "Error while unsharing"
-msgstr ""
+msgstr "حصل خطأ عند عملية إزالة المشاركة"
#: js/share.js:142
msgid "Error while changing permissions"
-msgstr ""
+msgstr "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
#: js/share.js:153
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "شورك معك من قبل {owner}"
#: js/share.js:158
msgid "Share with"
-msgstr ""
+msgstr "شارك مع"
#: js/share.js:163
msgid "Share with link"
-msgstr ""
+msgstr "شارك مع رابط"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
-msgstr ""
+msgstr "حماية كلمة السر"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "كلمة السر"
@@ -222,27 +223,27 @@ msgstr ""
#: js/share.js:177
msgid "Set expiration date"
-msgstr ""
+msgstr "تعيين تاريخ إنتهاء الصلاحية"
#: js/share.js:178
msgid "Expiration date"
-msgstr ""
+msgstr "تاريخ إنتهاء الصلاحية"
#: js/share.js:210
msgid "Share via email:"
-msgstr ""
+msgstr "مشاركة عبر البريد الإلكتروني:"
#: js/share.js:212
msgid "No people found"
-msgstr ""
+msgstr "لم يتم العثور على أي شخص"
#: js/share.js:239
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "لا يسمح بعملية إعادة المشاركة"
#: js/share.js:275
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "شورك في {item} مع {user}"
#: js/share.js:296
msgid "Unshare"
@@ -250,51 +251,51 @@ msgstr "إلغاء مشاركة"
#: js/share.js:308
msgid "can edit"
-msgstr ""
+msgstr "التحرير مسموح"
#: js/share.js:310
msgid "access control"
-msgstr ""
+msgstr "ضبط الوصول"
#: js/share.js:313
msgid "create"
-msgstr ""
+msgstr "إنشاء"
#: js/share.js:316
msgid "update"
-msgstr ""
+msgstr "تحديث"
#: js/share.js:319
msgid "delete"
-msgstr ""
+msgstr "حذف"
#: js/share.js:322
msgid "share"
-msgstr ""
+msgstr "مشاركة"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
-msgstr ""
+msgstr "محمي بكلمة السر"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
-msgstr ""
+msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
msgstr ""
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
msgstr ""
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
-msgstr ""
+msgstr "إعادة تعيين كلمة سر ownCloud"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -306,14 +307,14 @@ msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد ك
#: lostpassword/templates/lostpassword.php:5
msgid "Reset email send."
-msgstr ""
+msgstr "إعادة إرسال البريد الإلكتروني."
#: lostpassword/templates/lostpassword.php:8
msgid "Request failed!"
-msgstr ""
+msgstr "فشل الطلب"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "إسم المستخدم"
@@ -359,7 +360,7 @@ msgstr "المساعدة"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "التوصّل محظور"
#: templates/404.php:12
msgid "Cloud not found"
@@ -375,13 +376,13 @@ msgstr "أدخل"
#: templates/installation.php:23 templates/installation.php:31
msgid "Security Warning"
-msgstr ""
+msgstr "تحذير أمان"
#: templates/installation.php:24
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension."
#: templates/installation.php:26
msgid ""
@@ -402,44 +403,44 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "أضف </strong>مستخدم رئيسي <strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "خيارات متقدمة"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "مجلد المعلومات"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "أسس قاعدة البيانات"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "سيتم استخدمه"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "مستخدم قاعدة البيانات"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "كلمة سر مستخدم قاعدة البيانات"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "إسم قاعدة البيانات"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
-msgstr ""
+msgstr "مساحة جدول قاعدة البيانات"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "خادم قاعدة البيانات"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "انهاء التعديلات"
@@ -527,29 +528,29 @@ msgstr "خدمات الوب تحت تصرفك"
msgid "Log out"
msgstr "الخروج"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "تم رفض تسجيل الدخول التلقائي!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "هل نسيت كلمة السر؟"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "تذكر"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "أدخل"
@@ -567,14 +568,14 @@ msgstr "التالي"
#: templates/verify.php:5
msgid "Security Warning!"
-msgstr ""
+msgstr "تحذير أمان!"
#: templates/verify.php:6
msgid ""
"Please verify your password. <br/>For security reasons you may be "
"occasionally asked to enter your password again."
-msgstr ""
+msgstr "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى."
#: templates/verify.php:16
msgid "Verify"
-msgstr ""
+msgstr "تحقيق"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 4c6c7c44821..92546656f2f 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <shiningmoon25@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 19:42+0000\n"
+"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +20,30 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "كلمة المرور"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr ""
+msgstr "تطبيق"
-#: templates/public.php:9
+#: templates/public.php:17
#, php-format
msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s شارك المجلد %s معك"
-#: templates/public.php:11
+#: templates/public.php:19
#, php-format
msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s شارك الملف %s معك"
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:22 templates/public.php:38
msgid "Download"
-msgstr ""
+msgstr "تحميل"
-#: templates/public.php:29
+#: templates/public.php:37
msgid "No preview available for"
-msgstr ""
+msgstr "لا يوجد عرض مسبق لـ"
-#: templates/public.php:37
+#: templates/public.php:43
msgid "web services under your control"
-msgstr ""
+msgstr "خدمات الشبكة تحت سيطرتك"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 850b57a0081..3b32ba6301d 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <shiningmoon25@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 19:47+0000\n"
+"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +18,26 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
+#: js/settings-personal.js:31 templates/settings-personal.php:7
msgid "Expire all versions"
-msgstr ""
+msgstr "إنهاء تاريخ الإنتهاء لجميع الإصدارات"
#: js/versions.js:16
msgid "History"
-msgstr ""
+msgstr "السجل الزمني"
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "الإصدارات"
-#: templates/settings-personal.php:7
+#: templates/settings-personal.php:10
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "هذه العملية ستقوم بإلغاء جميع إصدارات النسخ الاحتياطي للملفات"
#: templates/settings.php:3
msgid "Files Versioning"
-msgstr ""
+msgstr "أصدرة الملفات"
#: templates/settings.php:4
msgid "Enable"
-msgstr ""
+msgstr "تفعيل"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index fc9b90e3d69..6a9cdf2b15b 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-24 00:11+0100\n"
+"PO-Revision-Date: 2012-12-23 19:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,43 +17,43 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: app.php:285
+#: app.php:287
msgid "Help"
msgstr "المساعدة"
-#: app.php:292
+#: app.php:294
msgid "Personal"
msgstr "شخصي"
-#: app.php:297
+#: app.php:299
msgid "Settings"
msgstr "تعديلات"
-#: app.php:302
+#: app.php:304
msgid "Users"
msgstr "المستخدمين"
-#: app.php:309
+#: app.php:311
msgid "Apps"
msgstr ""
-#: app.php:311
+#: app.php:313
msgid "Admin"
msgstr ""
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -83,11 +83,11 @@ msgstr ""
#: template.php:103
msgid "seconds ago"
-msgstr ""
+msgstr "منذ ثواني"
#: template.php:104
msgid "1 minute ago"
-msgstr ""
+msgstr "منذ دقيقة"
#: template.php:105
#, php-format
@@ -105,7 +105,7 @@ msgstr ""
#: template.php:108
msgid "today"
-msgstr ""
+msgstr "اليوم"
#: template.php:109
msgid "yesterday"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index e84963aded2..e3ac2066d0d 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -4,14 +4,15 @@
#
# Translators:
# <icewind1991@gmail.com>, 2012.
+# <shiningmoon25@gmail.com>, 2012.
# <tarek.taha@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:11+0100\n"
+"PO-Revision-Date: 2012-12-23 18:36+0000\n"
+"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +22,27 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "فشل تحميل القائمة من الآب ستور"
#: ajax/creategroup.php:10
msgid "Group already exists"
-msgstr ""
+msgstr "المجموعة موجودة مسبقاً"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr ""
+msgstr "فشل إضافة المجموعة"
#: ajax/enableapp.php:12
msgid "Could not enable app. "
-msgstr ""
+msgstr "فشل عملية تفعيل التطبيق"
#: ajax/lostpassword.php:12
msgid "Email saved"
-msgstr ""
+msgstr "تم حفظ البريد الإلكتروني"
#: ajax/lostpassword.php:14
msgid "Invalid email"
-msgstr ""
+msgstr "البريد الإلكتروني غير صالح"
#: ajax/openid.php:13
msgid "OpenID Changed"
@@ -53,7 +54,7 @@ msgstr "طلبك غير مفهوم"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
-msgstr ""
+msgstr "فشل إزالة المجموعة"
#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
msgid "Authentication error"
@@ -61,7 +62,7 @@ msgstr "لم يتم التأكد من الشخصية بنجاح"
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr ""
+msgstr "فشل إزالة المستخدم"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -69,25 +70,25 @@ msgstr "تم تغيير اللغة"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "لا يستطيع المدير إزالة حسابه من مجموعة المديرين"
#: ajax/togglegroups.php:28
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "فشل إضافة المستخدم الى المجموعة %s"
#: ajax/togglegroups.php:34
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "فشل إزالة المستخدم من المجموعة %s"
#: js/apps.js:28 js/apps.js:67
msgid "Disable"
-msgstr ""
+msgstr "إيقاف"
#: js/apps.js:28 js/apps.js:55
msgid "Enable"
-msgstr ""
+msgstr "تفعيل"
#: js/personal.js:69
msgid "Saving..."
@@ -99,11 +100,11 @@ msgstr "__language_name__"
#: templates/apps.php:10
msgid "Add your App"
-msgstr ""
+msgstr "أضف تطبيقاتك"
#: templates/apps.php:11
msgid "More Apps"
-msgstr ""
+msgstr "المزيد من التطبيقات"
#: templates/apps.php:27
msgid "Select an App"
@@ -111,98 +112,118 @@ msgstr "إختر تطبيقاً"
#: templates/apps.php:31
msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "راجع صفحة التطبيق على apps.owncloud.com"
#: templates/apps.php:32
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "التوثيق"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "كتاب توثيق المستخدم"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr ""
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "كتاب توثيق المدير"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "إسأل سؤال"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "توثيق متوفر على الشبكة"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "منتدى"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "إذهب هنالك بنفسك"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "تعقب علة"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "الجواب"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "دعم تجاري"
#: templates/personal.php:8
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "الزبائن"
#: templates/personal.php:13
-msgid "Download"
-msgstr "انزال"
+msgid "Download Desktop Clients"
+msgstr "تحميل عملاء سطح المكتب"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "تحميل عميل آندرويد"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "تحميل عميل آي أو أس"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "كلمات السر"
+
+#: templates/personal.php:22
msgid "Your password was changed"
-msgstr ""
+msgstr "لقد تم تغيير كلمة السر"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "لم يتم تعديل كلمة السر بنجاح"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "كلمات السر الحالية"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "كلمات سر جديدة"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "أظهر"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "العنوان البريدي"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "عنوانك البريدي"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "اللغة"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "ساعد في الترجمه"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام الملفات "
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "إصدار"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -210,16 +231,12 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>."
#: templates/users.php:21 templates/users.php:76
msgid "Name"
msgstr "الاسم"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "كلمات السر"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "مجموعات"
@@ -230,7 +247,7 @@ msgstr "انشئ"
#: templates/users.php:35
msgid "Default Quota"
-msgstr ""
+msgstr "الحصة النسبية الإفتراضية"
#: templates/users.php:55 templates/users.php:138
msgid "Other"
@@ -238,7 +255,7 @@ msgstr "شيء آخر"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "مدير المجموعة"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 51ea5c8216f..7aaa90abe9a 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 19:40+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
-msgstr ""
+msgstr "كلمة المرور"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index dcf1788ab57..ac1aa5b4a5e 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# <hussein-atef@hotmail.com>, 2012.
+# <shiningmoon25@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 13:18+0000\n"
-"Last-Translator: TYMAH <hussein-atef@hotmail.com>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 19:22+0000\n"
+"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "الرابط: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 3b8329c58be..8350e56bea4 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -118,29 +118,29 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Документация"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Задайте въпрос"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Проблеми при свързване с помощната база"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Отидете ръчно."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Отговор"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "Клиенти"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Изтегляне"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Парола"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Невъзможна промяна на паролата"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Текуща парола"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Нова парола"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "показва"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Промяна на парола"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Е-поща"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Адресът на е-пощата ви"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Въведете е-поща за възстановяване на паролата"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Език"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Помощ за превода"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr ""
msgid "Name"
msgstr "Име"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Парола"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Групи"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 23f9ad3829b..7d102e98bdf 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: bg_BG\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 54b239e5f9a..b77ffa970b2 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 0ce863841d7..9fd20a8ef12 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 09:48+0000\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 14:22+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -163,8 +163,8 @@ msgid "The object type is not specified."
msgstr "No s'ha especificat el tipus d'objecte."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Error"
@@ -174,9 +174,9 @@ msgstr "No s'ha especificat el nom de l'aplicació."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr "El figtxer requerit {file} no està instal·lat!"
+msgstr "El fitxer requerit {file} no està instal·lat!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Error en compartir"
@@ -204,11 +204,11 @@ msgstr "Comparteix amb"
msgid "Share with link"
msgstr "Comparteix amb enllaç"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Protegir amb contrasenya"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Contrasenya"
@@ -273,23 +273,23 @@ msgstr "elimina"
msgid "share"
msgstr "comparteix"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data d'expiració"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Error en establir la data d'expiració"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
@@ -313,8 +313,8 @@ msgstr "S'ha enviat el correu reinicialització"
msgid "Request failed!"
msgstr "El requeriment ha fallat!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Nom d'usuari"
@@ -403,44 +403,44 @@ msgstr "La carpeta de dades i els fitxers provablement són accessibles des d'in
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>compte d'administrador</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avançat"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Carpeta de dades"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configura la base de dades"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "s'usarà"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Usuari de la base de dades"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Contrasenya de la base de dades"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nom de la base de dades"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Espai de taula de la base de dades"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Ordinador central de la base de dades"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Acaba la configuració"
@@ -528,29 +528,29 @@ msgstr "controleu els vostres serveis web"
msgid "Log out"
msgstr "Surt"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "L'ha rebutjat l'acceditació automàtica!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Heu perdut la contrasenya?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "recorda'm"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Inici de sessió"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index b17a5d30e30..da4cfbd6279 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: Josep Tomàs <jtomas.binsoft@gmail.com>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 09:18+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -120,29 +120,29 @@ msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentació"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Documentació d'usuari"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gestió de fitxers grans"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Documentació d'administrador"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Feu una pregunta"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Documentació en línia"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemes per connectar amb la base de dades d'ajuda."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Fòrum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Vés-hi manualment."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Seguiment d'errors"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Resposta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Suport comercial"
#: templates/personal.php:8
#, php-format
@@ -150,62 +150,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clients de sincronització d'escriptori i de mòbil"
+msgid "Clients"
+msgstr "Clients"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Baixada"
+msgid "Download Desktop Clients"
+msgstr "Baixa clients d'escriptori"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr " Baixa el client per Android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Baixa el client per iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Contrasenya"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "La seva contrasenya s'ha canviat"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "No s'ha pogut canviar la contrasenya"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Contrasenya actual"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Contrasenya nova"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mostra"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Correu electrònic"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Correu electrònic"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Versió"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,10 +239,6 @@ msgstr "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_bl
msgid "Name"
msgstr "Nom"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Contrasenya"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grups"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 78f5bcc2ccd..10b45cc3214 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 13:55+0000\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"PO-Revision-Date: 2012-12-16 09:56+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Avís:</b> El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Màquina"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Usuari"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contrasenya"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtre d'inici de sessió d'usuari"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Llista de filtres d'usuari"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtre de grup"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defineix el filtre a aplicar quan es mostren grups."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Arbre base d'usuaris"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Arbre base de grups"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associació membres-grup"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "No ho useu en connexions SSL, fallarà."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desactiva la validació de certificat SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "No recomanat, ús només per proves."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Camp per mostrar el nom d'usuari"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Camp per mostrar el nom del grup"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segons. Un canvi buidarà la memòria de cau."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index 55cf8589357..c7a053911de 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 09:25+0000\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 09:21+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "Adreça WebDAV: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud enviarà les credencials d'usuari a aquesta URL. S'interpretarà http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index e2e213e5fcb..153ae93c6e1 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 19:53+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -121,29 +121,29 @@ msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentace"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Uživatelská dokumentace"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Správa velkých souborů"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Dokumentace správce"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Zeptat se"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Online dokumentace"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problémy s připojením k databázi s nápovědou."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Fórum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Přejít ručně."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Odpověď"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Placená podpora"
#: templates/personal.php:8
#, php-format
@@ -151,62 +151,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Klienti pro synchronizaci"
+msgid "Clients"
+msgstr "Klienti"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Stáhnout"
+msgid "Download Desktop Clients"
+msgstr "Stáhnout klienty pro počítač"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Stáhnout klienta pro android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Stáhnout klienta pro iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Heslo"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Vaše heslo bylo změněno"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Vaše heslo nelze změnit"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Současné heslo"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nové heslo"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "zobrazit"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Vaše e-mailová adresa"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Verze"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -220,10 +240,6 @@ msgstr "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komun
msgid "Name"
msgstr "Jméno"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Heslo"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Skupiny"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 808367304a8..89d650bf77d 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 15:30+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Počítač"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Základní DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Uživatelské DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtr přihlášení uživatelů"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtr uživatelských seznamů"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Určuje použitý filtr, pro získávaní uživatelů."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znaků, např. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtr skupin"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Určuje použitý filtr, pro získávaní skupin."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Základní uživatelský strom"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Základní skupinový strom"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociace člena skupiny"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Použít TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišující velikost znaků (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Vypnout ověřování SSL certifikátu."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Není doporučeno, pouze pro testovací účely."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Pole pro zobrazované jméno uživatele"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Pole pro zobrazení jména skupiny"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "v bajtech"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Nápověda"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 6f4e008376e..3545665816d 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-11 00:01+0100\n"
-"PO-Revision-Date: 2012-11-10 10:16+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 19:51+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "URL WebDAV: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud odešle přihlašovací údaje uživatele na URL a z návratové hodnoty určí stav přihlášení. Http 401 a 403 vyhodnotí jako neplatné údaje a všechny ostatní jako úspěšné přihlášení."
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 01fdc7642c0..6fa46250122 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
# <mikkelbjerglarsen@gmail.com>, 2011, 2012.
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2012.
# Ole Holm Frandsen <froksen@gmail.com>, 2012.
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 21:57+0000\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,30 +28,30 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Bruger %s delte en fil med dig"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Bruger %s delte en mappe med dig"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Kategori typen ikke er fastsat."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -64,18 +65,18 @@ msgstr "Denne kategori eksisterer allerede: "
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Object type ikke er fastsat."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID ikke oplyst."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Fejl ved tilføjelse af %s til favoritter."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -84,7 +85,7 @@ msgstr "Ingen kategorier valgt"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Fejl ved fjernelse af %s fra favoritter."
#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
@@ -104,11 +105,11 @@ msgstr "{minutes} minutter siden"
#: js/js.js:707
msgid "1 hour ago"
-msgstr ""
+msgstr "1 time siden"
#: js/js.js:708
msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} timer siden"
#: js/js.js:709
msgid "today"
@@ -128,7 +129,7 @@ msgstr "sidste måned"
#: js/js.js:713
msgid "{months} months ago"
-msgstr ""
+msgstr "{months} måneder siden"
#: js/js.js:714
msgid "months ago"
@@ -165,23 +166,23 @@ msgstr "OK"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Objekttypen er ikke angivet."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Fejl"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Den app navn er ikke angivet."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Den krævede fil {file} er ikke installeret!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Fejl under deling"
@@ -209,22 +210,22 @@ msgstr "Del med"
msgid "Share with link"
msgstr "Del med link"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Beskyt med adgangskode"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Kodeord"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "E-mail link til person"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Send"
#: js/share.js:177
msgid "Set expiration date"
@@ -278,25 +279,25 @@ msgstr "slet"
msgid "share"
msgstr "del"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Sender ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "E-mail afsendt"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -312,14 +313,14 @@ msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
#: lostpassword/templates/lostpassword.php:5
msgid "Reset email send."
-msgstr ""
+msgstr "Reset-mail afsendt."
#: lostpassword/templates/lostpassword.php:8
msgid "Request failed!"
-msgstr ""
+msgstr "Anmodningen mislykkedes!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Brugernavn"
@@ -408,44 +409,44 @@ msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet.
msgid "Create an <strong>admin account</strong>"
msgstr "Opret en <strong>administratorkonto</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avanceret"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "vil blive brugt"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Databasebruger"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Databasekodeord"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Navn på database"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Database tabelplads"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Databasehost"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Afslut opsætning"
@@ -533,29 +534,29 @@ msgstr "Webtjenester under din kontrol"
msgid "Log out"
msgstr "Log ud"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatisk login afvist!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Skift adgangskode for at sikre din konto igen."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Mistet dit kodeord?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "husk"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Log ind"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 2b9b44a9169..185ea7031e7 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2012.
# Ole Holm Frandsen <froksen@gmail.com>, 2012.
# <osos@openeyes.dk>, 2012.
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 21:45+0000\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgstr "Der er ingen fejl, filen blev uploadet med success"
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
#: ajax/upload.php:23
msgid ""
@@ -59,11 +60,11 @@ msgstr "Fejl ved skrivning til disk."
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
msgstr "Fjern deling"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Slet"
@@ -71,39 +72,39 @@ msgstr "Slet"
msgid "Rename"
msgstr "Omdøb"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
msgstr "{new_name} eksisterer allerede"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
msgstr "erstat"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
msgstr "foreslå navn"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
msgstr "fortryd"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
msgstr "erstattede {new_name}"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
msgstr "fortryd"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
msgstr "erstattede {new_name} med {old_name}"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
msgstr "ikke delte {files}"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
msgstr "slettede {files}"
@@ -111,82 +112,82 @@ msgstr "slettede {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "genererer ZIP-fil, det kan tage lidt tid."
-#: js/files.js:218
+#: js/files.js:212
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
-#: js/files.js:218
+#: js/files.js:212
msgid "Upload Error"
msgstr "Fejl ved upload"
-#: js/files.js:235
+#: js/files.js:229
msgid "Close"
msgstr "Luk"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:248 js/files.js:362 js/files.js:392
msgid "Pending"
msgstr "Afventer"
-#: js/files.js:274
+#: js/files.js:268
msgid "1 file uploading"
msgstr "1 fil uploades"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:271 js/files.js:325 js/files.js:340
msgid "{count} files uploading"
msgstr "{count} filer uploades"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:343 js/files.js:376
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/files.js:451
+#: js/files.js:445
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
-#: js/files.js:523
+#: js/files.js:515
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
-#: js/files.js:704
+#: js/files.js:699
msgid "{count} files scanned"
msgstr "{count} filer skannet"
-#: js/files.js:712
+#: js/files.js:707
msgid "error while scanning"
msgstr "fejl under scanning"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:780 templates/index.php:66
msgid "Name"
msgstr "Navn"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:781 templates/index.php:77
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:782 templates/index.php:79
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:814
+#: js/files.js:801
msgid "1 folder"
msgstr "1 mappe"
-#: js/files.js:816
+#: js/files.js:803
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/files.js:824
+#: js/files.js:811
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:826
+#: js/files.js:813
msgid "{count} files"
msgstr "{count} filer"
@@ -236,7 +237,7 @@ msgstr "Mappe"
#: templates/index.php:14
msgid "From link"
-msgstr ""
+msgstr "Fra link"
#: templates/index.php:35
msgid "Upload"
@@ -246,28 +247,28 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Fortryd upload"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Her er tomt. Upload noget!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "Download"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Upload for stor"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Filerne bliver indlæst, vent venligst."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "Indlæser"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 804a2489d08..d21b07f05e6 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
# Ole Holm Frandsen <froksen@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 21:47+0000\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,14 +48,14 @@ msgstr "Fejl ved konfiguration af Google Drive plads"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det."
#: templates/settings.php:3
msgid "External Storage"
@@ -101,7 +102,7 @@ msgid "Users"
msgstr "Brugere"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Slet"
@@ -113,10 +114,10 @@ msgstr "Aktiver ekstern opbevaring for brugere"
msgid "Allow users to mount their own external storage"
msgstr "Tillad brugere at montere deres egne eksterne opbevaring"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL-rodcertifikater"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Importer rodcertifikat"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 76cd064267c..187d797c533 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:11+0100\n"
+"PO-Revision-Date: 2012-12-23 21:58+0000\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +20,43 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:285
+#: app.php:287
msgid "Help"
msgstr "Hjælp"
-#: app.php:292
+#: app.php:294
msgid "Personal"
msgstr "Personlig"
-#: app.php:297
+#: app.php:299
msgid "Settings"
msgstr "Indstillinger"
-#: app.php:302
+#: app.php:304
msgid "Users"
msgstr "Brugere"
-#: app.php:309
+#: app.php:311
msgid "Apps"
msgstr "Apps"
-#: app.php:311
+#: app.php:313
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "ZIP-download er slået fra."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Filer skal downloades en for en."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Tilbage til Filer"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "De markerede filer er for store til at generere en ZIP-fil."
@@ -81,7 +82,7 @@ msgstr "SMS"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "Billeder"
#: template.php:103
msgid "seconds ago"
@@ -98,12 +99,12 @@ msgstr "%d minutter siden"
#: template.php:106
msgid "1 hour ago"
-msgstr ""
+msgstr "1 time siden"
#: template.php:107
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "%d timer siden"
#: template.php:108
msgid "today"
@@ -125,7 +126,7 @@ msgstr "Sidste måned"
#: template.php:112
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "%d måneder siden"
#: template.php:113
msgid "last year"
@@ -151,4 +152,4 @@ msgstr "Check for opdateringer er deaktiveret"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Kunne ikke finde kategorien \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 948c398c076..95a859329a8 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
# <icewind1991@gmail.com>, 2012.
# <mikkelbjerglarsen@gmail.com>, 2011.
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2012.
@@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-26 00:11+0100\n"
+"PO-Revision-Date: 2012-12-25 13:45+0000\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +77,7 @@ msgstr "Sprog ændret"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administratorer kan ikke fjerne dem selv fra admin gruppen"
#: ajax/togglegroups.php:28
#, php-format
@@ -124,92 +125,112 @@ msgstr "Se applikationens side på apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentation"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Brugerdokumentation"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Håndter store filer"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Administrator Dokumentation"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Stil et spørgsmål"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Online dokumentation"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemer med at forbinde til hjælpe-databasen."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Gå derhen manuelt."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Svar"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Kommerciel support"
#: templates/personal.php:8
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Synkroniserings programmer for desktop og mobil"
+msgid "Clients"
+msgstr "Klienter"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Download"
+msgid "Download Desktop Clients"
+msgstr "Hent Desktop Klienter"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Hent Android Klient"
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Hent iOS Klient"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Kodeord"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Din adgangskode blev ændret"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Ude af stand til at ændre dit kodeord"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Nuværende adgangskode"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Ny adgangskode"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "vis"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Din emailadresse"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Sprog"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "benyt denne adresse til at forbinde til din ownCloud i din filbrowser"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Version"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -223,10 +244,6 @@ msgstr "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ow
msgid "Name"
msgstr "Navn"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Kodeord"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupper"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 95a083e9f1e..0aab1f40519 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,6 +3,8 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <blah@blacksunset.dk>, 2012.
+# <cronner@gmail.com>, 2012.
# Frederik Lassen <frederiklassen@gmail.com>, 2012.
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
# <sr@ybnet.dk>, 2012.
@@ -10,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 09:31+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
+"POT-Creation-Date: 2012-12-26 00:10+0100\n"
+"PO-Revision-Date: 2012-12-25 19:52+0000\n"
+"Last-Translator: Daraiko <blah@blacksunset.dk>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,153 +23,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "You can specify Base DN for users and groups in the Advanced tab"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Bruger DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Kodeord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
-msgstr ""
+msgstr "Bruger Login Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
-msgstr ""
+msgstr "Brugerliste Filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definere filteret der bruges ved indlæsning af brugere."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
-msgstr ""
+msgstr "Gruppe Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definere filteret der bruges når der indlæses grupper."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
-msgstr ""
+msgstr "Base Bruger Træ"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
-msgstr ""
+msgstr "Base Group Tree"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
-msgstr ""
+msgstr "Group-Member association"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Brug TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Brug ikke til SSL forbindelser, da den vil fejle."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Deaktiver SSL certifikat validering"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Anbefales ikke, brug kun for at teste."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
-msgstr ""
+msgstr "User Display Name Field"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
-msgstr ""
+msgstr "i bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hjælp"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index d91890971df..73cb352861f 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cronner@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 22:14+0000\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr ""
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index fa82ef3b2e6..861465cce99 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -7,6 +7,7 @@
# <alex.hotz@gmail.com>, 2011.
# <blobbyjj@ymail.com>, 2012.
# <georg.stefan.germany@googlemail.com>, 2011.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
# <mail@felixmoeller.de>, 2012.
@@ -15,15 +16,16 @@
# <m.fresel@sysangels.com>, 2012.
# <niko@nik-o-mat.de>, 2012.
# Phi Lieb <>, 2012.
+# Susi <>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 13:50+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,26 +36,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Der Nutzer %s hat eine Datei für Dich freigegeben"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s hat ein Verzeichnis für Dich freigegeben"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -175,8 +177,8 @@ msgid "The object type is not specified."
msgstr "Der Objekttyp ist nicht angegeben."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Fehler"
@@ -188,7 +190,7 @@ msgstr "Der App-Name ist nicht angegeben."
msgid "The required file {file} is not installed!"
msgstr "Die benötigte Datei {file} ist nicht installiert."
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Fehler beim Freigeben"
@@ -216,22 +218,22 @@ msgstr "Freigeben für"
msgid "Share with link"
msgstr "Über einen Link freigeben"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Passwort"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Link per E-Mail verschicken"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Senden"
#: js/share.js:177
msgid "Set expiration date"
@@ -285,25 +287,25 @@ msgstr "löschen"
msgid "share"
msgstr "freigeben"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Fehler beim entfernen des Ablaufdatums"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "E-Mail wurde verschickt"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -325,8 +327,8 @@ msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
msgid "Request failed!"
msgstr "Die Anfrage schlug fehl!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Benutzername"
@@ -415,44 +417,44 @@ msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Fortgeschritten"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "wird verwendet"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Installation abschließen"
@@ -540,29 +542,29 @@ msgstr "Web-Services unter Ihrer Kontrolle"
msgid "Log out"
msgstr "Abmelden"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatischer Login zurückgewiesen!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "merken"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Einloggen"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 1d52174a221..c8d7b8f8e41 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -4,6 +4,7 @@
#
# Translators:
# <blobbyjj@ymail.com>, 2012.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 13:57+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,14 +50,14 @@ msgstr "Fehler beim Einrichten von Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator."
#: templates/settings.php:3
msgid "External Storage"
@@ -103,7 +104,7 @@ msgid "Users"
msgstr "Benutzer"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Löschen"
@@ -115,10 +116,10 @@ msgstr "Externen Speicher für Benutzer aktivieren"
msgid "Allow users to mount their own external storage"
msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL-Root-Zertifikate"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 4d80da3751f..019a9c65ce0 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -24,9 +24,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 13:54+0000\n"
-"Last-Translator: AndryXY <mibunrui@gmx.de>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 14:02+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -132,29 +132,29 @@ msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentation"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Dokumentation für Benutzer"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Große Dateien verwalten"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Dokumentation für Administratoren"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Stelle eine Frage"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Online-Dokumentation"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Probleme bei der Verbindung zur Hilfe-Datenbank."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Datenbank direkt besuchen."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Antwort"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Kommerzieller Support"
#: templates/personal.php:8
#, php-format
@@ -162,62 +162,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop- und mobile Clients für die Synchronisation"
+msgid "Clients"
+msgstr "Kunden"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Download"
+msgid "Download Desktop Clients"
+msgstr "Desktop-Client herunterladen"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Android-Client herunterladen"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "iOS-Client herunterladen"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Dein Passwort wurde geändert."
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Passwort konnte nicht geändert werden"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Aktuelles Passwort"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Neues Passwort"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "zeigen"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Deine E-Mail-Adresse"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Hilf bei der Übersetzung"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Verwende diese Adresse, um Deine ownCloud mit Deinem Dateimanager zu verbinden."
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Version"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -231,10 +251,6 @@ msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_bla
msgid "Name"
msgstr "Name"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Passwort"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Gruppen"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 71044b0d502..7e83a5b2043 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -4,17 +4,19 @@
#
# Translators:
# <blobbyjj@ymail.com>, 2012.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Maurice Preuß <>, 2012.
# <niko@nik-o-mat.de>, 2012.
# Phi Lieb <>, 2012.
+# Susi <>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:13+0000\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 14:04+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -24,153 +26,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Schalte die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 8a1620f09d1..392938e5f92 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-14 00:02+0100\n"
-"PO-Revision-Date: 2012-11-13 18:15+0000\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 14:08+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -20,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index f106dc2fb2a..116cf3006cd 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -7,6 +7,7 @@
# <alex.hotz@gmail.com>, 2011.
# <a.tangemann@web.de>, 2012.
# <blobbyjj@ymail.com>, 2012.
+# <deh3nne@deviantdev.com>, 2012.
# <georg.stefan.germany@googlemail.com>, 2011.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -21,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 13:52+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,26 +35,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Der Nutzer %s hat eine Datei für Sie freigegeben"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s hat ein Verzeichnis für Sie freigegeben"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -175,8 +176,8 @@ msgid "The object type is not specified."
msgstr "Der Objekttyp ist nicht angegeben."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Fehler"
@@ -188,7 +189,7 @@ msgstr "Der App-Name ist nicht angegeben."
msgid "The required file {file} is not installed!"
msgstr "Die benötigte Datei {file} ist nicht installiert."
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Fehler bei der Freigabe"
@@ -216,22 +217,22 @@ msgstr "Freigeben für"
msgid "Share with link"
msgstr "Über einen Link freigeben"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Passwort"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Link per E-Mail verschicken"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Senden"
#: js/share.js:177
msgid "Set expiration date"
@@ -285,25 +286,25 @@ msgstr "löschen"
msgid "share"
msgstr "freigeben"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "Email gesendet"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -325,8 +326,8 @@ msgstr "E-Mail zum Zurücksetzen des Passworts gesendet."
msgid "Request failed!"
msgstr "Die Anfrage schlug fehl!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Benutzername"
@@ -415,44 +416,44 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Fortgeschritten"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "wird verwendet"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Installation abschließen"
@@ -540,29 +541,29 @@ msgstr "Web-Services unter Ihrer Kontrolle"
msgid "Log out"
msgstr "Abmelden"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatische Anmeldung verweigert."
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "merken"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Einloggen"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 321c2a78ef5..6567207b387 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -4,6 +4,7 @@
#
# Translators:
# <blobbyjj@ymail.com>, 2012.
+# <deh3nne@deviantdev.com>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 13:57+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,14 +50,14 @@ msgstr "Fehler beim Einrichten von Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
#: templates/settings.php:3
msgid "External Storage"
@@ -103,7 +104,7 @@ msgid "Users"
msgstr "Benutzer"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Löschen"
@@ -115,10 +116,10 @@ msgstr "Externen Speicher für Benutzer aktivieren"
msgid "Allow users to mount their own external storage"
msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL-Root-Zertifikate"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 064c038d576..d95b7bb40db 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -18,14 +18,15 @@
# Phi Lieb <>, 2012.
# <seeed@freenet.de>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
+# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-04 00:06+0100\n"
-"PO-Revision-Date: 2012-12-03 21:41+0000\n"
-"Last-Translator: seeed <seeed@freenet.de>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 14:01+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -131,29 +132,29 @@ msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentation"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Dokumentation für Benutzer"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Große Dateien verwalten"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Dokumentation für Administratoren"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Stellen Sie eine Frage"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Online-Dokumentation"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Probleme bei der Verbindung zur Hilfe-Datenbank."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Datenbank direkt besuchen."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Antwort"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Kommerzieller Support"
#: templates/personal.php:8
#, php-format
@@ -161,62 +162,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop- und mobile Clients für die Synchronisation"
+msgid "Clients"
+msgstr "Kunden"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Download"
+msgid "Download Desktop Clients"
+msgstr "Desktop-Client herunterladen"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Android-Client herunterladen"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "iOS-Client herunterladen"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Ihr Passwort wurde geändert."
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Das Passwort konnte nicht geändert werden"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Aktuelles Passwort"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Neues Passwort"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "zeigen"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Ihre E-Mail-Adresse"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden."
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Version"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -224,16 +245,12 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
+msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
#: templates/users.php:21 templates/users.php:76
msgid "Name"
msgstr "Name"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Passwort"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Gruppen"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 430a4290235..843b2e80f4d 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -8,13 +8,14 @@
# Maurice Preuß <>, 2012.
# <niko@nik-o-mat.de>, 2012.
# Phi Lieb <>, 2012.
+# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:41+0000\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 14:04+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -24,153 +25,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benöntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 76e04750dee..9cb13ec43ec 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -4,13 +4,15 @@
#
# Translators:
# <a.tangemann@web.de>, 2012.
+# <multimill@gmail.com>, 2012.
+# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-14 00:02+0100\n"
-"PO-Revision-Date: 2012-11-13 18:15+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 23:03+0000\n"
+"Last-Translator: multimill <multimill@gmail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +21,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud "
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 29a4a7ee03e..7a42857d69c 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 13:25+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,26 +27,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Ο χρήστης %s διαμοιράστηκε ένα αρχείο με εσάς"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Ο χρήστης %s διαμοιράστηκε ένα φάκελο με εσάς"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Ο χρήστης %s διαμοιράστηκε το αρχείο \"%s\" μαζί σας. Είναι διαθέσιμο για λήψη εδώ: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -168,8 +168,8 @@ msgid "The object type is not specified."
msgstr "Δεν καθορίστηκε ο τύπος του αντικειμένου."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Σφάλμα"
@@ -181,7 +181,7 @@ msgstr "Δεν καθορίστηκε το όνομα της εφαρμογής.
msgid "The required file {file} is not installed!"
msgstr "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιρασμό"
@@ -209,22 +209,22 @@ msgstr "Διαμοιρασμός με"
msgid "Share with link"
msgstr "Διαμοιρασμός με σύνδεσμο"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Προστασία συνθηματικού"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Συνθηματικό"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Αποστολή συνδέσμου με email "
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Αποστολή"
#: js/share.js:177
msgid "Set expiration date"
@@ -278,25 +278,25 @@ msgstr "διαγραφή"
msgid "share"
msgstr "διαμοιρασμός"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Αποστολή..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "Το Email απεστάλη "
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -318,8 +318,8 @@ msgstr "Η επαναφορά του email στάλθηκε."
msgid "Request failed!"
msgstr "Η αίτηση απέτυχε!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Όνομα Χρήστη"
@@ -408,44 +408,44 @@ msgstr "Ο κατάλογος data και τα αρχεία σας πιθανό
msgid "Create an <strong>admin account</strong>"
msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Για προχωρημένους"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Φάκελος δεδομένων"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Ρύθμιση της βάσης δεδομένων"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "θα χρησιμοποιηθούν"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Χρήστης της βάσης δεδομένων"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Συνθηματικό βάσης δεδομένων"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Όνομα βάσης δεδομένων"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Κενά Πινάκων Βάσης Δεδομένων"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Διακομιστής βάσης δεδομένων"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Ολοκλήρωση εγκατάστασης"
@@ -533,29 +533,29 @@ msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
msgid "Log out"
msgstr "Αποσύνδεση"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Απορρίφθηκε η αυτόματη σύνδεση!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ξεχάσατε το συνθηματικό σας;"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "απομνημόνευση"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Είσοδος"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 85209f363a5..5129f6e33ff 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -6,6 +6,7 @@
# Dimitris M. <monopatis@gmail.com>, 2012.
# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
# Marios Bekatoros <>, 2012.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
@@ -13,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 11:20+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 13:50+0000\n"
+"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,11 +59,11 @@ msgstr "Αποτυχία εγγραφής στο δίσκο"
msgid "Files"
msgstr "Αρχεία"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
msgstr "Διακοπή κοινής χρήσης"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Διαγραφή"
@@ -70,39 +71,39 @@ msgstr "Διαγραφή"
msgid "Rename"
msgstr "Μετονομασία"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
msgstr "{new_name} υπάρχει ήδη"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
msgstr "αντικατέστησε"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
msgstr "συνιστώμενο όνομα"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
msgstr "ακύρωση"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
msgstr "{new_name} αντικαταστάθηκε"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
msgstr "αναίρεση"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
msgstr "μη διαμοιρασμένα {files}"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
msgstr "διαγραμμένα {files}"
@@ -112,80 +113,80 @@ msgid ""
"allowed."
msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
-#: js/files.js:218
+#: js/files.js:212
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
-#: js/files.js:218
+#: js/files.js:212
msgid "Upload Error"
msgstr "Σφάλμα Αποστολής"
-#: js/files.js:235
+#: js/files.js:229
msgid "Close"
msgstr "Κλείσιμο"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:248 js/files.js:362 js/files.js:392
msgid "Pending"
msgstr "Εκκρεμεί"
-#: js/files.js:274
+#: js/files.js:268
msgid "1 file uploading"
msgstr "1 αρχείο ανεβαίνει"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:271 js/files.js:325 js/files.js:340
msgid "{count} files uploading"
msgstr "{count} αρχεία ανεβαίνουν"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:343 js/files.js:376
msgid "Upload cancelled."
msgstr "Η αποστολή ακυρώθηκε."
-#: js/files.js:451
+#: js/files.js:445
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή."
+msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
-#: js/files.js:523
+#: js/files.js:515
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud"
-#: js/files.js:704
+#: js/files.js:699
msgid "{count} files scanned"
msgstr "{count} αρχεία ανιχνεύτηκαν"
-#: js/files.js:712
+#: js/files.js:707
msgid "error while scanning"
msgstr "σφάλμα κατά την ανίχνευση"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:780 templates/index.php:66
msgid "Name"
msgstr "Όνομα"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:781 templates/index.php:77
msgid "Size"
msgstr "Μέγεθος"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:782 templates/index.php:79
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/files.js:814
+#: js/files.js:801
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/files.js:816
+#: js/files.js:803
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/files.js:824
+#: js/files.js:811
msgid "1 file"
msgstr "1 αρχείο"
-#: js/files.js:826
+#: js/files.js:813
msgid "{count} files"
msgstr "{count} αρχεία"
@@ -245,28 +246,28 @@ msgstr "Αποστολή"
msgid "Cancel upload"
msgstr "Ακύρωση αποστολής"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "Λήψη"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν το διακομιστή."
+msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε"
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "Τρέχουσα αναζήτηση "
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index c1705152ae5..f72135ae53a 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 13:41+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,14 +51,14 @@ msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
#: templates/settings.php:3
msgid "External Storage"
@@ -104,7 +105,7 @@ msgid "Users"
msgstr "Χρήστες"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Διαγραφή"
@@ -116,10 +117,10 @@ msgstr "Ενεργοποίηση Εξωτερικού Αποθηκευτικού
msgid "Allow users to mount their own external storage"
msgstr "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Πιστοποιητικά SSL root"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Εισαγωγή Πιστοποιητικού Root"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 62961834e0e..4b27d019760 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 11:21+0000\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 13:06+0000\n"
"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -126,29 +126,29 @@ msgstr "Δείτε την σελίδα εφαρμογών στο apps.owncloud.c
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Τεκμηρίωση"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Τεκμηρίωση Χρήστη"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Διαχείριση Μεγάλων Αρχείων"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Τεκμηρίωση Διαχειριστή"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Ρωτήστε μια ερώτηση"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Τεκμηρίωση στο Διαδίκτυο"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Φόρουμ"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Χειροκίνητη μετάβαση."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Απάντηση"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Εμπορική Υποστήριξη"
#: templates/personal.php:8
#, php-format
@@ -156,62 +156,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Πελάτες συγχρονισμού για Desktop και Mobile"
+msgid "Clients"
+msgstr "Πελάτες"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Λήψη"
+msgid "Download Desktop Clients"
+msgstr "Λήψη Προγραμμάτων για Σταθερούς Υπολογιστές"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Λήψη Προγράμματος Android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Λήψη Προγράμματος iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Συνθηματικό"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Το συνθηματικό σας έχει αλλάξει"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Τρέχων συνθηματικό"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Νέο συνθηματικό"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "εμφάνιση"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Αλλαγή συνθηματικού"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Γλώσσα"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφραση"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "χρησιμοποιήστε αυτήν τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Έκδοση"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -225,10 +245,6 @@ msgstr "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/conta
msgid "Name"
msgstr "Όνομα"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Συνθηματικό"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Ομάδες"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 4712df12fdd..14b7e75c710 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -3,16 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <anastasia2501@hotmail.com>, 2012.
# Dimitris M. <monopatis@gmail.com>, 2012.
# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
# Marios Bekatoros <>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 06:46+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 14:12+0000\n"
+"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,153 +23,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Προσοχή:</b> Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει."
+
+#: templates/settings.php:15
msgid "Host"
-msgstr ""
+msgstr "Διακομιστής"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Συνθηματικό"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "User Login Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "User List Filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Group Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Θύρα"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Base User Tree"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Χρήση TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Πεδίο Ονόματος Χρήστη"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Group Display Name Field"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "σε bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Βοήθεια"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index 6a11e198943..dff8dd88f35 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -4,13 +4,15 @@
#
# Translators:
# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 20:12+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 13:55+0000\n"
+"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +21,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "Το ownCloud θα στείλει τα συνθηματικά χρήστη σε αυτό το URL, μεταφράζοντας τα http 401 και http 403 ως λανθασμένα συνθηματικά και όλους τους άλλους κωδικούς ως σωστά συνθηματικά."
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 03095412f69..ae8dd9eeedc 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 07:11+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,26 +23,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "La uzanto %s kunhavigis dosieron kun vi"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "La uzanto %s kunhavigis dosierujon kun vi"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "La uzanto %s kunhavigis la dosieron “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -164,8 +164,8 @@ msgid "The object type is not specified."
msgstr "Ne indikiĝis tipo de la objekto."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Eraro"
@@ -177,7 +177,7 @@ msgstr "Ne indikiĝis nomo de la aplikaĵo."
msgid "The required file {file} is not installed!"
msgstr "La necesa dosiero {file} ne instaliĝis!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
@@ -205,22 +205,22 @@ msgstr "Kunhavigi kun"
msgid "Share with link"
msgstr "Kunhavigi per ligilo"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Protekti per pasvorto"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Pasvorto"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Retpoŝti la ligilon al ulo"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Sendi"
#: js/share.js:177
msgid "Set expiration date"
@@ -274,25 +274,25 @@ msgstr "forigi"
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Sendante..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "La retpoŝtaĵo sendiĝis"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -314,8 +314,8 @@ msgstr ""
msgid "Request failed!"
msgstr "Peto malsukcesis!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Uzantonomo"
@@ -404,44 +404,44 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Krei <strong>administran konton</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Progresinta"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datuma dosierujo"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Agordi la datumbazon"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "estos uzata"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Datumbaza uzanto"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Datumbaza pasvorto"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Datumbaza nomo"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Datumbaza tabelospaco"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Datumbaza gastigo"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Fini la instalon"
@@ -547,11 +547,11 @@ msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree."
msgid "Lost your password?"
msgstr "Ĉu vi perdis vian pasvorton?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "memori"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Ensaluti"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 49a5a9135e4..3a49fa3de2d 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 22:14+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -117,29 +117,29 @@ msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentaro"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Administrante grandajn dosierojn"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Faru demandon"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemoj okazis dum konektado al la helpa datumbazo."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Iri tien mane."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Respondi"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Labortablaj kaj porteblaj sinkronigoklientoj"
+msgid "Clients"
+msgstr "Klientoj"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Elŝuti"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Pasvorto"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Via pasvorto ŝanĝiĝis"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Ne eblis ŝanĝi vian pasvorton"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Nuna pasvorto"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nova pasvorto"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "montri"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Ŝanĝi la pasvorton"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Retpoŝto"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Via retpoŝta adreso"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Lingvo"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "uzu ĉi tiun adreson por konektiĝi al via ownCloud per via dosieradministrilo"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank
msgid "Name"
msgstr "Nomo"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Pasvorto"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupoj"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 0f048daf6be..419be520bc0 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 05:41+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Gastigo"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Baz-DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Uzanto-DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Pasvorto"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtrilo de uzantensaluto"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtrilo de uzantolisto"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtrilo de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Pordo"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Baza uzantarbo"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Baza gruparbo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asocio de grupo kaj membro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Uzi TLS-on"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ne rekomendata, uzu ĝin nur por testoj."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Kampo de vidignomo de uzanto"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Kampo de vidignomo de grupo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "duumoke"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Helpo"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index cb6f7a47384..60a766ad4c7 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 19:41+0000\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 03:35+0000\n"
"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV-a URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index c4ac4a05389..3aebf45effa 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,6 +6,7 @@
# <javierkaiser@gmail.com>, 2012.
# Javier Llorente <javier@opensuse.org>, 2012.
# <juanma@kde.org.ar>, 2011-2012.
+# <malmirk@gmail.com>, 2012.
# oSiNaReF <>, 2012.
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
# <rodrigo.calvo@gmail.com>, 2012.
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 11:51+0000\n"
+"Last-Translator: malmirk <malmirk@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,26 +31,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "El usuario %s ha compartido un archivo contigo"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "El usuario %s ha compartido una carpeta contigo"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -216,18 +217,18 @@ msgstr "Compartir con enlace"
msgid "Password protect"
msgstr "Protegido por contraseña"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Contraseña"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Enviar un enlace por correo electrónico a una persona"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: js/share.js:177
msgid "Set expiration date"
@@ -295,11 +296,11 @@ msgstr "Error estableciendo fecha de caducidad"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Enviando..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Correo electrónico enviado"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -321,8 +322,8 @@ msgstr "Email de reconfiguración enviado."
msgid "Request failed!"
msgstr "Pedido fallado!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Nombre de usuario"
@@ -411,44 +412,44 @@ msgstr "Su directorio de datos y sus archivos están probablemente accesibles de
msgid "Create an <strong>admin account</strong>"
msgstr "Crea una <strong>cuenta de administrador</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avanzado"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Directorio de almacenamiento"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "se utilizarán"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Completar la instalación"
@@ -554,11 +555,11 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
msgid "Lost your password?"
msgstr "¿Has perdido tu contraseña?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "recuérdame"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Entrar"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8e8c25c4e24..edd67031275 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -126,29 +126,29 @@ msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentación"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Administra archivos grandes"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Hacer una pregunta"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemas al conectar con la base de datos de ayuda."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Ir manualmente"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Respuesta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -156,62 +156,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clientes de sincronización móviles y de escritorio"
+msgid "Clients"
+msgstr "Clientes"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Descargar"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Contraseña"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Su contraseña ha sido cambiada"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "No se ha podido cambiar tu contraseña"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Contraseña actual"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nueva contraseña:"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mostrar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Correo electrónico"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Tu dirección de correo"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ayúdanos a traducir"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "utiliza esta dirección para conectar a tu ownCloud desde tu gestor de archivos"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -225,10 +245,6 @@ msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_bl
msgid "Name"
msgstr "Nombre"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Contraseña"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupos"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index fdf3b2be402..32c72e60755 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -5,6 +5,7 @@
# Translators:
# Javier Llorente <javier@opensuse.org>, 2012.
# <juanma@kde.org.ar>, 2012.
+# <manudeloz86@gmail.com>, 2012.
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
# Rubén Trujillo <rubentrf@gmail.com>, 2012.
# <sergioballesterossolanas@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 14:15+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2012-12-19 00:03+0100\n"
+"PO-Revision-Date: 2012-12-18 00:58+0000\n"
+"Last-Translator: valarauco <manudeloz86@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,153 +24,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Advertencia:</b> El módulo PHP LDAP necesario no está instalado, el sistema no funcionará. Pregunte al administrador del sistema para instalarlo."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin placeholder, ej: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "No usarlo para SSL, habrá error."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Apagar la validación por certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Un cambio vacía la cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 905074ada98..e6ff0da90b0 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 17:28+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 89e8050adf8..d0650773d3c 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-11 00:04+0100\n"
-"PO-Revision-Date: 2012-12-10 00:39+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -117,29 +117,29 @@ msgstr "Mirá la web de aplicaciones apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentación"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Administrar archivos grandes"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Hacer una pregunta"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemas al conectar con la base de datos de ayuda."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Ir de forma manual"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Respuesta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Usaste <strong>%s</strong> de los <strong>%s</strong> disponibles"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clientes de sincronización para celulares, tablets y de escritorio"
+msgid "Clients"
+msgstr "Clientes"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Descargar"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Contraseña"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Tu contraseña fue cambiada"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "No fue posible cambiar tu contraseña"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Contraseña actual"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nueva contraseña:"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mostrar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Correo electrónico"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Tu dirección de e-mail"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "usá esta dirección para conectarte a tu ownCloud desde tu gestor de archivos"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_bl
msgid "Name"
msgstr "Nombre"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Contraseña"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupos"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 218284e3da9..80ab2e1f1f5 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 22:51+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar cuando se obtienen grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "No usarlo para SSL, dará error."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desactivar la validación por certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Cambiarlo vacía la cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 85a8f008f81..e3165d3da3d 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 10:49+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "URL de WebDAV: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index d758c91271d..0212408126c 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentatsioon"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Suurte failide haldamine"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Küsi küsimus"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Probleemid abiinfo andmebaasiga ühendumisel."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Mine sinna käsitsi."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Vasta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Töölaua ja mobiiliga sünkroniseerimise rakendused"
+msgid "Clients"
+msgstr "Kliendid"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Lae alla"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Parool"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Sinu parooli on muudetud"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Sa ei saa oma parooli muuta"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Praegune parool"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Uus parool"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "näita"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Sinu e-posti aadress"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Keel"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr ""
msgid "Name"
msgstr "Nimi"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Parool"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupid"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index ccccf7cb20a..c8207cb0467 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-30 00:01+0100\n"
-"PO-Revision-Date: 2012-10-29 22:48+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Baas DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Kasutaja DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Parool"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Kasutajanime filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Kasutajate nimekirja filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Grupi filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Baaskasutaja puu"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Baasgrupi puu"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Grupiliikme seotus"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Kasutaja TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Mittetõstutundlik LDAP server (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Lülita SSL sertifikaadi kontrollimine välja."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Pole soovitatav, kasuta ainult testimiseks."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Kasutaja näidatava nime väli"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Grupi näidatava nime väli"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "baitides"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "sekundites. Muudatus tühjendab vahemälu."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Abiinfo"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 06fb9adc8f9..2e1b479cbe8 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:03+0100\n"
-"PO-Revision-Date: 2012-11-29 21:18+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 70742445f54..285a6bad98d 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 20:50+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +46,14 @@ msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Erabiltzaileak"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Ezabatu"
@@ -112,10 +112,10 @@ msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
msgid "Allow users to mount their own external storage"
msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL erro ziurtagiriak"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Inportatu Erro Ziurtagiria"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 56ad7508eff..88627e3567b 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:17+0100\n"
-"PO-Revision-Date: 2012-12-13 11:48+0000\n"
-"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 20:53+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -118,29 +118,29 @@ msgstr "Ikusi programen orria apps.owncloud.com en"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentazioa"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Erabiltzaile dokumentazioa"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Fitxategi handien kudeaketa"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Administradore dokumentazioa"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Egin galdera bat"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Online dokumentazioa"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Arazoak daude laguntza datubasera konektatzeko."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Foroa"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Joan hara eskuz."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Erantzun"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Babes komertziala"
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Mahaigain eta mugikorren sinkronizazio bezeroak"
+msgid "Clients"
+msgstr "Bezeroak"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Deskargatu"
+msgid "Download Desktop Clients"
+msgstr "Deskargatu mahaigainerako bezeroak"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Deskargatu Android bezeroa"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Deskargatu iOS bezeroa"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Pasahitza"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Zere pasahitza aldatu da"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Ezin izan da zure pasahitza aldatu"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Uneko pasahitza"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Pasahitz berria"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "erakutsi"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-Posta"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Zure e-posta"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Hizkuntza"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Bertsioa"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komun
msgid "Name"
msgstr "Izena"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Pasahitza"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Taldeak"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a8b8ab93ae8..6184b2abf9d 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 21:29+0000\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 20:38+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Hostalaria"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Oinarrizko DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Erabiltzaile DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Pasahitza"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Erabiltzaileen saioa hasteko iragazkia"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Erabiltzaile zerrendaren Iragazkia"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Taldeen iragazkia"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Portua"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Oinarrizko Erabiltzaile Zuhaitza"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Oinarrizko Talde Zuhaitza"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Talde-Kide elkarketak"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Erabili TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ez erabili SSL konexioetan, huts egingo du."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Taldeen bistaratzeko izena duen eremua"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "bytetan"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "segundutan. Aldaketak katxea husten du."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Laguntza"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index eca9edb6ff5..0f039352404 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-26 00:01+0100\n"
-"PO-Revision-Date: 2012-11-25 22:56+0000\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 20:58+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira."
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index e0c3b853c89..3d7035f89a2 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: ho2o2oo <tamass4116@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -119,29 +119,29 @@ msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "مستندات"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "مدیریت پرونده های بزرگ"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "یک سوال بپرسید"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "مشکلاتی برای وصل شدن به پایگاه داده کمکی"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "بروید آنجا به صورت دستی"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "پاسخ"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -149,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr " ابزار مدیریت با دسکتاپ و موبایل"
+msgid "Clients"
+msgstr "مشتریان"
#: templates/personal.php:13
-msgid "Download"
-msgstr "بارگیری"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "گذرواژه"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "رمز عبور شما تغییر یافت"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "ناتوان در تغییر گذرواژه"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "گذرواژه کنونی"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "گذرواژه جدید"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "نمایش"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "پست الکترونیکی"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "پست الکترونیکی شما"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "زبان"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "از این نشانی برای وصل شدن به ابرهایتان در مدیرپرونده استفاده کنید"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,10 +238,6 @@ msgstr ""
msgid "Name"
msgstr "نام"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "گذرواژه"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "گروه ها"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 4a711bf2019..f7e8c607e27 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "میزبانی"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "رمز عبور"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "راه‌نما"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index aedbab15475..2987a7b6bdb 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index e57ca7e117c..c7c2c1c4a14 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 13:22+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -213,18 +213,18 @@ msgstr "Jaa linkillä"
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Salasana"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Lähetä linkki sähköpostitse"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Lähetä"
#: js/share.js:177
msgid "Set expiration date"
@@ -292,11 +292,11 @@ msgstr "Virhe päättymispäivää asettaessa"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Lähetetään..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Sähköposti lähetetty"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -318,8 +318,8 @@ msgstr ""
msgid "Request failed!"
msgstr "Pyyntö epäonnistui!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Käyttäjätunnus"
@@ -408,44 +408,44 @@ msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htac
msgid "Create an <strong>admin account</strong>"
msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Lisäasetukset"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datakansio"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Muokkaa tietokantaa"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "käytetään"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Tietokannan käyttäjä"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Tietokannan salasana"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Tietokannan nimi"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Tietokannan taulukkotila"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Tietokantapalvelin"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Viimeistele asennus"
@@ -551,11 +551,11 @@ msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
msgid "Lost your password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "muista"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Kirjaudu sisään"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index bfb17285b22..18876d4aa6b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-12-05 10:40+0000\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 17:40+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -118,29 +118,29 @@ msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentaatio"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Käyttäjäohjeistus"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Suurten tiedostojen hallinta"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Ylläpito-ohjeistus"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Kysy jotain"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Verkko-ohjeistus"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Virhe yhdistettäessä tietokantaan."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Keskustelupalsta"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Siirry sinne itse."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Ohjelmistovirheiden jäljitys"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Vastaus"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Kaupallinen tuki"
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Tietokoneen ja mobiililaitteiden synkronointisovellukset"
+msgid "Clients"
+msgstr "Asiakkaat"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Lataa"
+msgid "Download Desktop Clients"
+msgstr "Lataa työpöytäsovelluksia"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Lataa Android-sovellus"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Lataa iOS-sovellus"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Salasana"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Salasanasi vaihdettiin"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Salasanaasi ei voitu vaihtaa"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Nykyinen salasana"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Uusi salasana"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "näytä"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Sähköposti"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Sähköpostiosoitteesi"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Kieli"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Versio"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" targe
msgid "Name"
msgstr "Nimi"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Salasana"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Ryhmät"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 085ca3dd65b..6f821f095c1 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 10:56+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,153 +21,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Isäntä"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Oletus DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä "
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Käyttäjän DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Salasana"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Login suodatus"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Käyttäjien suodatus"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan. "
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Ryhmien suodatus"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. "
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Portti"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Oletuskäyttäjäpuu"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Ryhmien juuri"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Käytä TLS:ää"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. "
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Poista käytöstä SSL-varmenteen vahvistus"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ei suositella, käytä vain testausta varten."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Käyttäjän näytettävän nimen kenttä"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "tavuissa"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "sekunneissa. Muutos tyhjentää välimuistin."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ohje"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index b3fa002d0f3..1bf07546c14 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 11:43+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV-osoite: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 3630d49e784..6dafbd6ca14 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -7,17 +7,19 @@
# <fkhannouf@me.com>, 2012.
# <florentin.lemoal@gmail.com>, 2012.
# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
+# <mishka.lazzlo@gmail.com>, 2012.
# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
# <nathaplop@gmail.com>, 2012.
+# <nicolas@shivaserv.fr>, 2012.
# <rom1dep@gmail.com>, 2011.
# Romain DEP. <rom1dep@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
+"PO-Revision-Date: 2012-12-28 23:01+0000\n"
+"Last-Translator: ouafnico <nicolas@shivaserv.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,26 +30,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "L'utilisateur %s a partagé un fichier avec vous"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "L'utilsateur %s a partagé un dossier avec vous"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "L'utilisateur %s a partagé le fichier \"%s\" avec vous. Vous pouvez le télécharger ici : %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "L'utilisateur %s a partagé le dossier \"%s\" avec vous. Il est disponible au téléchargement ici : %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -169,8 +171,8 @@ msgid "The object type is not specified."
msgstr "Le type d'objet n'est pas spécifié."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Erreur"
@@ -182,7 +184,7 @@ msgstr "Le nom de l'application n'est pas spécifié."
msgid "The required file {file} is not installed!"
msgstr "Le fichier requis {file} n'est pas installé !"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
@@ -210,22 +212,22 @@ msgstr "Partager avec"
msgid "Share with link"
msgstr "Partager via lien"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Mot de passe"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Envoyez le lien par email"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Envoyer"
#: js/share.js:177
msgid "Set expiration date"
@@ -279,25 +281,25 @@ msgstr "supprimer"
msgid "share"
msgstr "partager"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Un erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "En cours d'envoi ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "Email envoyé"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -319,8 +321,8 @@ msgstr "Mail de réinitialisation envoyé."
msgid "Request failed!"
msgstr "La requête a échoué !"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Nom d'utilisateur"
@@ -409,44 +411,44 @@ msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis
msgid "Create an <strong>admin account</strong>"
msgstr "Créer un <strong>compte administrateur</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avancé"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Répertoire des données"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configurer la base de données"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "sera utilisé"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Utilisateur pour la base de données"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Mot de passe de la base de données"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nom de la base de données"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Tablespaces de la base de données"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Serveur de la base de données"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Terminer l'installation"
@@ -534,29 +536,29 @@ msgstr "services web sous votre contrôle"
msgid "Log out"
msgstr "Se déconnecter"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Connexion automatique rejetée !"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Mot de passe perdu ?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "se souvenir de moi"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Connexion"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 5484aa3b4c9..a8f3ff32125 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <nicolas@shivaserv.fr>, 2012.
# Romain DEP. <rom1dep@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
+"PO-Revision-Date: 2012-12-28 23:07+0000\n"
+"Last-Translator: ouafnico <nicolas@shivaserv.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas possible. Contactez votre administrateur système pour l'installer."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas possible. Contactez votre administrateur système pour l'installer."
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +101,7 @@ msgid "Users"
msgstr "Utilisateurs"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Supprimer"
@@ -112,10 +113,10 @@ msgstr "Activer le stockage externe pour les utilisateurs"
msgid "Allow users to mount their own external storage"
msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Certificats racine SSL"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Importer un certificat racine"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index c3e8712f322..3d95e66bbea 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -11,6 +11,7 @@
# <guiguidu31300@gmail.com>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
# <life_0n_mars@live.fr>, 2012.
+# <mishka.lazzlo@gmail.com>, 2012.
# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
# <pierreamiel.giraud@gmail.com>, 2012.
# Robert Di Rosa <>, 2012.
@@ -20,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 10:26+0000\n"
-"Last-Translator: Robert Di Rosa <>\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
+"PO-Revision-Date: 2012-12-24 14:10+0000\n"
+"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -128,29 +129,29 @@ msgstr "Voir la page des applications à l'url apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Documentation utilisateur"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gérer les gros fichiers"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Documentation administrateur"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Poser une question"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Documentation en ligne"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problème de connexion à la base de données d'aide."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "S'y rendre manuellement."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Suivi de bugs"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Réponse"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Support commercial"
#: templates/personal.php:8
#, php-format
@@ -158,62 +159,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clients de synchronisation Mobile et Ordinateur"
+msgid "Clients"
+msgstr "Clients"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Télécharger"
+msgid "Download Desktop Clients"
+msgstr "Télécharger des clients de bureau"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Télécharger le client Android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Télécharger le client iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Mot de passe"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Votre mot de passe a été changé"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Impossible de changer votre mot de passe"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Mot de passe actuel"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nouveau mot de passe"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "Afficher"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Votre adresse e-mail"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Langue"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Version"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -227,10 +248,6 @@ msgstr "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_bla
msgid "Name"
msgstr "Nom"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Mot de passe"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Groupes"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 7fca3da0d59..d435d3b77ce 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -5,6 +5,7 @@
# Translators:
# Cyril Glapa <kyriog@gmail.com>, 2012.
# <mathieu.payrol@gmail.com>, 2012.
+# <mishka.lazzlo@gmail.com>, 2012.
# Romain DEP. <rom1dep@gmail.com>, 2012.
# <windes@tructor.net>, 2012.
# <zrk951@gmail.com>, 2012.
@@ -12,164 +13,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 08:51+0000\n"
-"Last-Translator: Windes <windes@tructor.net>\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
+"PO-Revision-Date: 2012-12-24 14:18+0000\n"
+"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installé, l'application ne marchera pas. Contactez votre administrateur système pour qu'il l'installe."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Hôte"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN Racine"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Mot de passe"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Modèle d'authentification utilisateurs"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtre d'utilisateurs"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtre de groupes"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "DN racine de l'arbre utilisateurs"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "DN racine de l'arbre groupes"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Association groupe-membre"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Utiliser TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Serveur LDAP insensible à la casse (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Désactiver la validation du certificat SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Non recommandé, utilisation pour tests uniquement."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Champ \"nom d'affichage\" de l'utilisateur"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Champ \"nom d'affichage\" du groupe"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en octets"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en secondes. Tout changement vide le cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laisser vide "
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Aide"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index ef3cebf7704..4d2c6a78376 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-26 00:01+0100\n"
-"PO-Revision-Date: 2012-11-25 00:28+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "URL WebDAV : http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 335d35593ba..234468f6e0a 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 21:49+0000\n"
-"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -117,29 +117,29 @@ msgstr "Vexa a páxina do aplicativo en apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentación"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Xestionar Grandes Ficheiros"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Pregunte"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemas conectando coa base de datos de axuda"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Ir manualmente."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Resposta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Tes usados <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Cliente de sincronización de escritorio e móbil"
+msgid "Clients"
+msgstr "Clientes"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Descargar"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Contrasinal"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "O seu contrasinal foi cambiado"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Incapaz de trocar o seu contrasinal"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Contrasinal actual"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Novo contrasinal"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "amosar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Mudar contrasinal"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Correo electrónico"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "O seu enderezo de correo electrónico"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba un enderezo de correo electrónico para habilitar a recuperación do contrasinal"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "utilice este enderezo para conectar ao seu ownCloud no xestor de ficheiros"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blan
msgid "Name"
msgstr "Nome"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Contrasinal"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupos"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 8f640a984aa..e61cf22989a 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-08 00:09+0100\n"
-"PO-Revision-Date: 2012-12-06 11:45+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN do usuario"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso en anónimo de o DN e o contrasinal baleiros."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contrasinal"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de acceso de usuarios"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtro da lista de usuarios"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar cando se recompilan os grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Base da árbore de usuarios"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base da árbore de grupo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación de grupos e membros"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Non empregualo para conexións SSL: fallará."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desactiva a validación do certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Non se recomenda. Só para probas."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo de mostra do nome de usuario"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo de mostra do nome de grupo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Calquera cambio baleira a caché."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Axuda"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index f2bbfc16c91..8fdb2745637 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 16:27+0000\n"
-"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "URL WebDAV: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 376b0ebf7f4..131ac2897e3 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 07:42+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +24,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך קובץ"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך תיקייה"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -210,18 +210,18 @@ msgstr "שיתוף עם קישור"
msgid "Password protect"
msgstr "הגנה בססמה"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "ססמה"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "שליחת קישור בדוא״ל למשתמש"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "שליחה"
#: js/share.js:177
msgid "Set expiration date"
@@ -289,11 +289,11 @@ msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "מתבצעת שליחה ..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "הודעת הדוא״ל נשלחה"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -315,8 +315,8 @@ msgstr "איפוס שליחת דוא״ל."
msgid "Request failed!"
msgstr "הבקשה נכשלה!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "שם משתמש"
@@ -405,44 +405,44 @@ msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישי
msgid "Create an <strong>admin account</strong>"
msgstr "יצירת <strong>חשבון מנהל</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "מתקדם"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "תיקיית נתונים"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "הגדרת מסד הנתונים"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "ינוצלו"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "שם משתמש במסד הנתונים"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "ססמת מסד הנתונים"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "שם מסד הנתונים"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "מרחב הכתובות של מסד הנתונים"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "שרת בסיס נתונים"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "סיום התקנה"
@@ -548,11 +548,11 @@ msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונ
msgid "Lost your password?"
msgstr "שכחת את ססמתך?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "שמירת הססמה"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "כניסה"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index ab535b9271f..860989631c4 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 17:21+0000\n"
+"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "הצפנה"
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
-msgstr ""
+#: templates/settings.php:6
+msgid "Enable Encryption"
+msgstr "הפעל הצפנה"
-#: templates/settings.php:5
+#: templates/settings.php:7
msgid "None"
-msgstr ""
+msgstr "כלום"
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr ""
+#: templates/settings.php:12
+msgid "Exclude the following file types from encryption"
+msgstr "הוצא את סוגי הקבצים הבאים מהצפנה"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 50e610dd371..1fe9d7e737f 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2012.
# <ido.parag@gmail.com>, 2012.
# <tomerc+transifex.net@gmail.com>, 2011.
# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 14:12+0000\n"
+"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -118,29 +119,29 @@ msgstr "צפה בעמוד הישום ב apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "תיעוד"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "תיעוד משתמש"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "ניהול קבצים גדולים"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "תיעוד מנהלים"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "שאל שאלה"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "תיעוד מקוון"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "בעיות בהתחברות לבסיס נתוני העזרה"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "פורום"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "גש לשם באופן ידני"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "מענה"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "תמיכה בתשלום"
#: templates/personal.php:8
#, php-format
@@ -148,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "לקוחות סנכרון למחשב שולחני ולנייד"
+msgid "Clients"
+msgstr "לקוחות"
#: templates/personal.php:13
-msgid "Download"
-msgstr "הורדה"
+msgid "Download Desktop Clients"
+msgstr "הורד לתוכנה למחשב"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "הורד תוכנה לאנדרואיד"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "הורד תוכנה לiOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "ססמה"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "הססמה שלך הוחלפה"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "לא ניתן לשנות את הססמה שלך"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "ססמה נוכחית"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "ססמה חדשה"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "הצגה"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "שינוי ססמה"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "דוא״ל"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "כתובת הדוא״ל שלך"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "פה"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "עזרה בתרגום"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "גרסא"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +238,6 @@ msgstr "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_bla
msgid "Name"
msgstr "שם"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "ססמה"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "קבוצות"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 88370513135..fb4f06d8441 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index a47de1367d9..e9a1a74eb85 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 4f0ccd14335..76241d2e5a1 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "नया पासवर्ड"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "पासवर्ड"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 1ca5b6139b6..ae9f03b0212 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index d4e892dd4b4..aa784d7aad0 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 5410216db21..b46de54ca70 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -118,29 +118,29 @@ msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "dokumentacija"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Upravljanje velikih datoteka"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Postavite pitanje"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problem pri spajanju na bazu podataka pomoći"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Idite tamo ručno."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Odgovor"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop i Mobile sinkronizaciji klijenti"
+msgid "Clients"
+msgstr "Klijenti"
#: templates/personal.php:13
-msgid "Download"
-msgstr "preuzimanje"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Lozinka"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Nemoguće promijeniti lozinku"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Trenutna lozinka"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nova lozinka"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "prikaz"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "e-mail adresa"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Vaša e-mail adresa"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr ""
msgid "Name"
msgstr "Ime"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Lozinka"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupe"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index a7e026ac791..5861922d336 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index 8837bf71d73..ec8c6a5f26a 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index f83e6251d1b..fcc66c8ce64 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentáció"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Nagy fájlok kezelése"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Tégy fel egy kérdést"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Sikertelen csatlakozás a Súgó adatbázishoz"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Menj oda kézzel"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Válasz"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Asztali- és mobilkliensek kezelése"
+msgid "Clients"
+msgstr "Kliensek"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Letöltés"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Jelszó"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Nem lehet megváltoztatni a jelszavad"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Jelenlegi jelszó"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Új jelszó"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "Mutat"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Jelszó megváltoztatása"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Email címed"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Töltsd ki az email címet, hogy engedélyezhesd a jelszó-visszaállítást"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Nyelv"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Segíts lefordítani!"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Használd ezt a címet hogy csatlakozz a saját ownCloud rendszeredhez a fájlkezelődben"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr ""
msgid "Name"
msgstr "Név"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Jelszó"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Csoportok"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index cacb371b1b5..330b4cd1465 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index cdb772c8e46..5b8d806958e 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 45647784aed..892fdc95fd9 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Facer un question"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Responsa"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "Clientes"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Discargar"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Contrasigno"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Non pote cambiar tu contrasigno"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Contrasigno currente"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nove contrasigno"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "monstrar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-posta"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Tu adresse de e-posta"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Linguage"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "usa iste addresse pro connecter a tu ownCloud in tu administrator de files"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr ""
msgid "Name"
msgstr "Nomine"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Contrasigno"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Gruppos"
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 73b531764ae..cae53dce374 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index 7a2ab1d26f2..d14ab08ef72 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 478557f09e0..4e52623ad95 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -119,29 +119,29 @@ msgstr "Lihat halaman aplikasi di apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentasi"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Mengelola berkas besar"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Ajukan pertanyaan"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Bermasalah saat menghubungi database bantuan."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Pergi kesana secara manual."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Jawab"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -149,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Klien sync Desktop dan Mobile"
+msgid "Clients"
+msgstr "Klien"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Unduh"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Password"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Tidak dapat merubah password anda"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Password saat ini"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "kata kunci baru"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "perlihatkan"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Rubah password"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Alamat email anda"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,10 +238,6 @@ msgstr ""
msgid "Name"
msgstr "Nama"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Password"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Group"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 8069104219e..193df390395 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-10-21 05:36+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "kata kunci"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "gunakan saringan login"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "saringan grup"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "gunakan TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "matikan validasi sertivikat SSL"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "dalam detik. perubahan mengosongkan cache"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "bantuan"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 68181d4405c..fc5b698ce72 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index fadc3690e0a..5872b39972e 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-06 00:11+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 469ae8a332d..06ab3b51ea6 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 94c92bbb7db..378e437e2a3 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 7dedc7efb1e..d1d6f74af3f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 09:09+0000\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 08:54+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -211,14 +211,14 @@ msgstr "Condividi con collegamento"
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Password"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Invia collegamento via email"
#: js/share.js:173
msgid "Send"
@@ -316,8 +316,8 @@ msgstr "Email di ripristino inviata."
msgid "Request failed!"
msgstr "Richiesta non riuscita!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Nome utente"
@@ -406,44 +406,44 @@ msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Int
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>account amministratore</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avanzate"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Cartella dati"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configura il database"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "sarà utilizzato"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Utente del database"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Password del database"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nome del database"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Spazio delle tabelle del database"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Host del database"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Termina la configurazione"
@@ -549,11 +549,11 @@ msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
msgid "Lost your password?"
msgstr "Hai perso la password?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "ricorda"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Accedi"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 2313377614a..e26395a5f44 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 06:39+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -122,29 +122,29 @@ msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentazione"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Documentazione utente"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gestione file grandi"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Documentazione amministratore"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Fai una domanda"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Documentazione in linea"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemi di connessione al database di supporto."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Raggiungilo manualmente."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Sistema di tracciamento bug"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Risposta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Supporto commerciale"
#: templates/personal.php:8
#, php-format
@@ -152,62 +152,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Client di sincronizzazione desktop e mobile"
+msgid "Clients"
+msgstr "Client"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Scaricamento"
+msgid "Download Desktop Clients"
+msgstr "Scarica client desktop"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Scarica client Android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Scarica client iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Password"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "La tua password è cambiata"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Modifica password non riuscita"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Password attuale"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nuova password"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mostra"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Modifica password"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Il tuo indirizzo email"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Lingua"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Migliora la traduzione"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Versione"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -221,10 +241,6 @@ msgstr "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank
msgid "Name"
msgstr "Nome"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Password"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Gruppi"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 9c8655920c6..9dc0007050a 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,164 +9,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 05:37+0000\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 10:28+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Avviso:</b> il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN utente"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Password"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro per l'accesso utente"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtro per l'elenco utenti"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro per il gruppo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Struttura base dell'utente"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Struttura base del gruppo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associazione gruppo-utente "
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Non utilizzare per le connessioni SSL, fallirà."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case insensitve LDAP server (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Disattiva il controllo del certificato SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Non consigliato, utilizzare solo per test."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo per la visualizzazione del nome utente"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo per la visualizzazione del nome del gruppo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in byte"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in secondi. Il cambio svuota la cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Aiuto"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index a2580c8fe86..074902ec724 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 14:45+0000\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 08:45+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "URL WebDAV: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud invierà le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index a60188539af..ae1bd30ee44 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -4,14 +4,15 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 11:56+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,26 +23,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "ユーザ %s はあなたとファイルを共有しています"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "ユーザ %s はあなたとフォルダを共有しています"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -208,18 +209,18 @@ msgstr "URLリンクで共有"
msgid "Password protect"
msgstr "パスワード保護"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "パスワード"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "メールリンク"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "送信"
#: js/share.js:177
msgid "Set expiration date"
@@ -287,11 +288,11 @@ msgstr "有効期限の設定でエラー発生"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "送信中..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "メールを送信しました"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -313,8 +314,8 @@ msgstr "リセットメールを送信します。"
msgid "Request failed!"
msgstr "リクエスト失敗!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "ユーザ名"
@@ -403,44 +404,44 @@ msgstr "データディレクトリとファイルが恐らくインターネッ
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>管理者アカウント</strong>を作成してください"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "詳細設定"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "データフォルダ"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "データベースを設定してください"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "が使用されます"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "データベースのユーザ名"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "データベースのパスワード"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "データベース名"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "データベースの表領域"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "データベースのホスト名"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "セットアップを完了します"
@@ -546,11 +547,11 @@ msgstr "アカウント保護の為、パスワードを再度の変更をお願
msgid "Lost your password?"
msgstr "パスワードを忘れましたか?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "パスワードを記憶する"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "ログイン"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 8d92134dba5..b41038ab9a7 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -4,14 +4,15 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
# <tetuyano+transi@gmail.com>, 2012.
# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 03:44+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -118,29 +119,29 @@ msgstr "apps.owncloud.com でアプリケーションのページを見てくだ
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "ドキュメント"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "ユーザドキュメント"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "大きなファイルを扱うには"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "管理者ドキュメント"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "質問してください"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "オンラインドキュメント"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "ヘルプデータベースへの接続時に問題が発生しました"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "フォーラム"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "手動で移動してください。"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "バグトラッカー"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "解答"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "コマーシャルサポート"
#: templates/personal.php:8
#, php-format
@@ -148,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "デスクトップおよびモバイル用の同期クライアント"
+msgid "Clients"
+msgstr "顧客"
#: templates/personal.php:13
-msgid "Download"
-msgstr "ダウンロード"
+msgid "Download Desktop Clients"
+msgstr "デスクトップクライアントをダウンロード"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Androidクライアントをダウンロード"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "iOSクライアントをダウンロード"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "パスワード"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "パスワードを変更しました"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "パスワードを変更することができません"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "現在のパスワード"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "新しいパスワード"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "表示"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "パスワードを変更"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "あなたのメールアドレス"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "言語"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "翻訳に協力する"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "バージョン"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +238,6 @@ msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud commu
msgid "Name"
msgstr "名前"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "パスワード"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "グループ"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index bd04cb5c537..39aa1002f7e 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -4,14 +4,15 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 02:03+0200\n"
-"PO-Revision-Date: 2012-10-01 08:48+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 06:21+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +21,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。"
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。"
+
+#: templates/settings.php:15
msgid "Host"
msgstr "ホスト"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "ベースDN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "ユーザDN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "パスワード"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "ユーザログインフィルタ"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "ユーザリストフィルタ"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "グループフィルタ"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "グループを取得するときに適用するフィルターを定義する。"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "ポート"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "ベースユーザツリー"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "ベースグループツリー"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "グループとメンバーの関連付け"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLSを利用"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "SSL接続に利用しないでください、失敗します。"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "大文字/小文字を区別しないLDAPサーバ(Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "SSL証明書の確認を無効にする。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "推奨しません、テスト目的でのみ利用してください。"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "ユーザ表示名のフィールド"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "グループ表示名のフィールド"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "グループのownCloud名の生成に利用するLDAP属性。"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "バイト"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "秒。変更後にキャッシュがクリアされます。"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ユーザ名を空のままにしてください(デフォルト)。そうでない場合は、LDAPもしくはADの属性を指定してください。"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "ヘルプ"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index 7cf5205b76d..b6499e4ce5f 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-14 00:02+0100\n"
-"PO-Revision-Date: 2012-11-13 03:13+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 03:51+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloudのこのURLへのユーザ資格情報の送信は、資格情報が間違っている場合はHTTP401もしくは403を返し、正しい場合は全てのコードを返します。"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index b957617cec3..363ba8a6bd4 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -116,29 +116,29 @@ msgstr "ნახეთ აპლიკაციის გვერდი apps.o
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "დოკუმენტაცია"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "დიდი ფაილების მენეჯმენტი"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "დასვით შეკითხვა"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "დახმარების ბაზასთან წვდომის პრობლემა"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "წადი იქ შენით."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "პასუხი"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "დესკტოპ და მობილური კლიენტების სინქრონიზაცია"
+msgid "Clients"
+msgstr "კლიენტები"
#: templates/personal.php:13
-msgid "Download"
-msgstr "ჩამოტვირთვა"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "პაროლი"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "თქვენი პაროლი შეიცვალა"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "თქვენი პაროლი არ შეიცვალა"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "მიმდინარე პაროლი"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "ახალი პაროლი"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "გამოაჩინე"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "პაროლის შეცვლა"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "იმეილი"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "თქვენი იმეილ მისამართი"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "ენა"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "თარგმნის დახმარება"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -215,10 +235,6 @@ msgstr ""
msgid "Name"
msgstr "სახელი"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "პაროლი"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "ჯგუფი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index bdf29a00b31..0df8aa5b1a4 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index 16ce800e33b..4582092b83e 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 5cf547ad047..7e948772a38 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 05:40+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -118,29 +118,29 @@ msgstr "apps.owncloud.com에 있는 앱 페이지를 참고하십시오"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-라이선스 보유자 <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "문서"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "큰 파일 관리"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "질문하기"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "데이터베이스에 연결하는 데 문제가 발생하였습니다."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "직접 갈 수 있습니다."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "대답"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "데스크톱 및 모바일 동기화 클라이언트"
+msgid "Clients"
+msgstr "고객"
#: templates/personal.php:13
-msgid "Download"
-msgstr "다운로드"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "암호"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "암호가 변경되었습니다"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "암호를 변경할 수 없음"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "현재 암호"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "새 암호"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "보이기"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "암호 변경"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "이메일"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "이메일 주소"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "언어"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "번역 돕기"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "파일 관리자에서 내 ownCloud에 연결할 때 이 주소를 사용하십시오"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커
msgid "Name"
msgstr "이름"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "암호"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "그룹"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f9102c199e2..b10823d7147 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:10+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "호스트"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "기본 DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "사용자 DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "암호"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "사용자 로그인 필터"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "사용자 목록 필터"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "그룹 필터"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "포트"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "기본 사용자 트리"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "기본 그룹 트리"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "그룹-회원 연결"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLS 사용"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "SSL 연결 시 사용하는 경우 연결되지 않습니다."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "SSL 인증서 유효성 검사를 해제합니다."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "추천하지 않음, 테스트로만 사용하십시오."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "사용자의 표시 이름 필드"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "그룹의 표시 이름 필드"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "바이트"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "도움말"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 8eb43e9a757..621bee70462 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 05:57+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index c64763c9cfc..535d2af3759 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "به‌ڵگه‌نامه"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
-msgstr "داگرتن"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "وشەی تێپەربو"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "وشەی نهێنی نوێ"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "ئیمه‌یل"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr "ناو"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "وشەی تێپەربو"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index bfa7aee57b7..f4e484f84f7 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index c600370b571..57ded88a09b 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 2b969101b5f..90bde23fab6 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -116,29 +116,29 @@ msgstr "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentatioun"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Grouss Fichieren verwalten"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Stell eng Fro"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Gei manuell dohinner."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Äntwert"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop an Mobile Syncing Clienten"
+msgid "Clients"
+msgstr "Clienten"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Passwuert"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Konnt däin Passwuert net änneren"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Momentan 't Passwuert"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Neit Passwuert"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "weisen"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Passwuert änneren"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Deng Email Adress"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Sprooch"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Hëllef iwwersetzen"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -215,10 +235,6 @@ msgstr ""
msgid "Name"
msgstr "Numm"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Passwuert"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Gruppen"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index ea1a1452c6f..be1657cb3d3 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 242212f8edc..626112fb833 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 10dd1bb7eb1..34f05c7c008 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentacija"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Užduoti klausimą"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemos jungiantis prie duomenų bazės"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Atsakyti"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "Klientai"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Atsisiųsti"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Jūsų slaptažodis buvo pakeistas"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Neįmanoma pakeisti slaptažodžio"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Dabartinis slaptažodis"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Naujas slaptažodis"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "rodyti"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Pakeisti slaptažodį"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "El. paštas"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Jūsų el. pašto adresas"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Kalba"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Padėkite išversti"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "naudokite šį adresą, jei norite pasiekti savo ownCloud per failų tvarkyklę"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr ""
msgid "Name"
msgstr "Vardas"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Slaptažodis"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupės"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 7e15e309ec7..9891d24f372 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Slaptažodis"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Grupės filtras"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Prievadas"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Naudoti TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Išjungti SSL sertifikato tikrinimą."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nerekomenduojama, naudokite tik testavimui."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pagalba"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 1b326476bf5..d4919105187 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index bb71a36d28a..22fd0c4bb2e 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr "Apskatie aplikāciju lapu - apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentācija"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Rīkoties ar apjomīgiem failiem"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Uzdod jautajumu"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problēmas ar datubāzes savienojumu"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Nokļūt tur pašrocīgi"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Atbildēt"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop un mobīlo ierīču sinhronizācijas rīks"
+msgid "Clients"
+msgstr ""
#: templates/personal.php:13
-msgid "Download"
-msgstr "Lejuplādēt"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Parole"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Jūru parole tika nomainīta"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Nav iespējams nomainīt jūsu paroli"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Pašreizējā parole"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Jauna parole"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "parādīt"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Nomainīt paroli"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Epasts"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Jūsu epasta adrese"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Valoda"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Palīdzi tulkot"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">
msgid "Name"
msgstr "Vārds"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Parole"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupas"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 2ec176f9288..b0d8f36bed3 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index afb2045c92c..c2af7da931a 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index e7581975904..6fd1d14dd61 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 12:49+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,30 +23,30 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Корисникот %s сподели датотека со Вас"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Корисникот %s сподели папка со Вас"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Не беше доставен тип на категорија."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -60,18 +60,18 @@ msgstr "Оваа категорија веќе постои:"
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Не беше доставен тип на објект."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID не беше доставено."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Грешка при додавање %s во омилени."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -80,7 +80,7 @@ msgstr "Не е одбрана категорија за бришење."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Грешка при бришење на %s од омилени."
#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
@@ -88,59 +88,59 @@ msgstr "Поставки"
#: js/js.js:704
msgid "seconds ago"
-msgstr ""
+msgstr "пред секунди"
#: js/js.js:705
msgid "1 minute ago"
-msgstr ""
+msgstr "пред 1 минута"
#: js/js.js:706
msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "пред {minutes} минути"
#: js/js.js:707
msgid "1 hour ago"
-msgstr ""
+msgstr "пред 1 час"
#: js/js.js:708
msgid "{hours} hours ago"
-msgstr ""
+msgstr "пред {hours} часови"
#: js/js.js:709
msgid "today"
-msgstr ""
+msgstr "денеска"
#: js/js.js:710
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
#: js/js.js:711
msgid "{days} days ago"
-msgstr ""
+msgstr "пред {days} денови"
#: js/js.js:712
msgid "last month"
-msgstr ""
+msgstr "минатиот месец"
#: js/js.js:713
msgid "{months} months ago"
-msgstr ""
+msgstr "пред {months} месеци"
#: js/js.js:714
msgid "months ago"
-msgstr ""
+msgstr "пред месеци"
#: js/js.js:715
msgid "last year"
-msgstr ""
+msgstr "минатата година"
#: js/js.js:716
msgid "years ago"
-msgstr ""
+msgstr "пред години"
#: js/oc-dialogs.js:126
msgid "Choose"
-msgstr ""
+msgstr "Избери"
#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
msgid "Cancel"
@@ -161,7 +161,7 @@ msgstr "Во ред"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Не е специфициран типот на објект."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
@@ -171,92 +171,92 @@ msgstr "Грешка"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Името на апликацијата не е специфицирано."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Задолжителната датотека {file} не е инсталирана!"
#: js/share.js:124 js/share.js:581
msgid "Error while sharing"
-msgstr ""
+msgstr "Грешка при споделување"
#: js/share.js:135
msgid "Error while unsharing"
-msgstr ""
+msgstr "Грешка при прекин на споделување"
#: js/share.js:142
msgid "Error while changing permissions"
-msgstr ""
+msgstr "Грешка при промена на привилегии"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Споделено со Вас и групата {group} од {owner}"
#: js/share.js:153
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Споделено со Вас од {owner}"
#: js/share.js:158
msgid "Share with"
-msgstr ""
+msgstr "Сподели со"
#: js/share.js:163
msgid "Share with link"
-msgstr ""
+msgstr "Сподели со врска"
#: js/share.js:164
msgid "Password protect"
-msgstr ""
+msgstr "Заштити со лозинка"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Лозинка"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Прати врска по е-пошта на личност"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Прати"
#: js/share.js:177
msgid "Set expiration date"
-msgstr ""
+msgstr "Постави рок на траење"
#: js/share.js:178
msgid "Expiration date"
-msgstr ""
+msgstr "Рок на траење"
#: js/share.js:210
msgid "Share via email:"
-msgstr ""
+msgstr "Сподели по е-пошта:"
#: js/share.js:212
msgid "No people found"
-msgstr ""
+msgstr "Не се најдени луѓе"
#: js/share.js:239
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Повторно споделување не е дозволено"
#: js/share.js:275
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Споделено во {item} со {user}"
#: js/share.js:296
msgid "Unshare"
-msgstr ""
+msgstr "Не споделувај"
#: js/share.js:308
msgid "can edit"
-msgstr ""
+msgstr "може да се измени"
#: js/share.js:310
msgid "access control"
-msgstr ""
+msgstr "контрола на пристап"
#: js/share.js:313
msgid "create"
@@ -264,35 +264,35 @@ msgstr "креирај"
#: js/share.js:316
msgid "update"
-msgstr ""
+msgstr "ажурирај"
#: js/share.js:319
msgid "delete"
-msgstr ""
+msgstr "избриши"
#: js/share.js:322
msgid "share"
-msgstr ""
+msgstr "сподели"
#: js/share.js:353 js/share.js:528 js/share.js:530
msgid "Password protected"
-msgstr ""
+msgstr "Заштитено со лозинка"
#: js/share.js:541
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Грешка при тргање на рокот на траење"
#: js/share.js:553
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Грешка при поставување на рок на траење"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Праќање..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Е-порака пратена"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -308,14 +308,14 @@ msgstr "Ќе добиете врска по е-пошта за да може д
#: lostpassword/templates/lostpassword.php:5
msgid "Reset email send."
-msgstr ""
+msgstr "Порката за ресетирање на лозинка пратена."
#: lostpassword/templates/lostpassword.php:8
msgid "Request failed!"
-msgstr ""
+msgstr "Барањето не успеа!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Корисничко име"
@@ -377,19 +377,19 @@ msgstr "Додади"
#: templates/installation.php:23 templates/installation.php:31
msgid "Security Warning"
-msgstr ""
+msgstr "Безбедносно предупредување"
#: templates/installation.php:24
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот."
#: templates/installation.php:26
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. "
#: templates/installation.php:32
msgid ""
@@ -398,50 +398,50 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот."
#: templates/installation.php:36
msgid "Create an <strong>admin account</strong>"
msgstr "Направете <strong>администраторска сметка</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Напредно"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Фолдер со податоци"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Конфигурирај ја базата"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "ќе биде користено"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Корисник на база"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Лозинка на база"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Име на база"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
-msgstr ""
+msgstr "Табела во базата на податоци"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Сервер со база"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Заврши го подесувањето"
@@ -531,27 +531,27 @@ msgstr "Одјава"
#: templates/login.php:8
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Одбиена автоматска најава!"
#: templates/login.php:9
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана"
#: templates/login.php:10
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно."
#: templates/login.php:15
msgid "Lost your password?"
msgstr "Ја заборавивте лозинката?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "запамти"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Најава"
@@ -569,14 +569,14 @@ msgstr "следно"
#: templates/verify.php:5
msgid "Security Warning!"
-msgstr ""
+msgstr "Безбедносно предупредување."
#: templates/verify.php:6
msgid ""
"Please verify your password. <br/>For security reasons you may be "
"occasionally asked to enter your password again."
-msgstr ""
+msgstr "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно."
#: templates/verify.php:16
msgid "Verify"
-msgstr ""
+msgstr "Потврди"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 6ff02992220..778f65fd741 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 12:18+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr "Нема грешка, датотеката беше подигната
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
#: ajax/upload.php:23
msgid ""
@@ -55,136 +55,136 @@ msgstr "Неуспеав да запишам на диск"
msgid "Files"
msgstr "Датотеки"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
-msgstr ""
+msgstr "Не споделувај"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Избриши"
#: js/fileactions.js:181
msgid "Rename"
-msgstr ""
+msgstr "Преименувај"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} веќе постои"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
-msgstr ""
+msgstr "замени"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
-msgstr ""
+msgstr "предложи име"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
-msgstr ""
+msgstr "откажи"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
-msgstr ""
+msgstr "земенета {new_name}"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
-msgstr ""
+msgstr "врати"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "заменета {new_name} со {old_name}"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
-msgstr ""
+msgstr "без споделување {files}"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
-msgstr ""
+msgstr "избришани {files}"
#: js/files.js:33
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
-#: js/files.js:218
+#: js/files.js:209
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
-#: js/files.js:218
+#: js/files.js:209
msgid "Upload Error"
msgstr "Грешка при преземање"
-#: js/files.js:235
+#: js/files.js:226
msgid "Close"
msgstr "Затвои"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
msgid "Pending"
msgstr "Чека"
-#: js/files.js:274
+#: js/files.js:265
msgid "1 file uploading"
-msgstr ""
+msgstr "1 датотека се подига"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} датотеки се подигаат"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/files.js:451
+#: js/files.js:442
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-#: js/files.js:523
+#: js/files.js:512
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud"
-#: js/files.js:704
+#: js/files.js:693
msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} датотеки скенирани"
-#: js/files.js:712
+#: js/files.js:701
msgid "error while scanning"
-msgstr ""
+msgstr "грешка при скенирање"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
msgid "Name"
msgstr "Име"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
msgid "Size"
msgstr "Големина"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
msgid "Modified"
msgstr "Променето"
-#: js/files.js:814
+#: js/files.js:803
msgid "1 folder"
-msgstr ""
+msgstr "1 папка"
-#: js/files.js:816
+#: js/files.js:805
msgid "{count} folders"
-msgstr ""
+msgstr "{count} папки"
-#: js/files.js:824
+#: js/files.js:813
msgid "1 file"
-msgstr ""
+msgstr "1 датотека"
-#: js/files.js:826
+#: js/files.js:815
msgid "{count} files"
-msgstr ""
+msgstr "{count} датотеки"
#: templates/admin.php:5
msgid "File handling"
@@ -232,7 +232,7 @@ msgstr "Папка"
#: templates/index.php:14
msgid "From link"
-msgstr ""
+msgstr "Од врска"
#: templates/index.php:35
msgid "Upload"
@@ -242,28 +242,28 @@ msgstr "Подигни"
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Датотеката е премногу голема"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Се скенираат датотеки, ве молам почекајте."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "Моментално скенирам"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 7a40ba3a3b1..2b4f5dfb57a 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:14+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Енкрипција"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Исклучи ги следните типови на датотеки од енкрипција"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Ништо"
-#: templates/settings.php:10
+#: templates/settings.php:12
msgid "Enable Encryption"
-msgstr ""
+msgstr "Овозможи енкрипција"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 0505c9e2d88..586863c6b16 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
+"PO-Revision-Date: 2012-12-28 09:20+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,76 +20,76 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
msgid "Access granted"
-msgstr ""
+msgstr "Пристапот е дозволен"
#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Грешка при конфигурација на Dropbox"
#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
-msgstr ""
+msgstr "Дозволи пристап"
#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
-msgstr ""
+msgstr "Пополни ги сите задолжителни полиња"
#: js/dropbox.js:85
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Ве молам доставите валиден Dropbox клуч и тајна лозинка."
#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Грешка при конфигурација на Google Drive"
#: lib/config.php:434
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Внимание:</b> Не е овозможена или инсталирани FTP подршка во PHP. Не е можно монтирање на FTP дискови. Замолете го Вашиот систем администратор да го инсталира."
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Надворешно складиште"
#: templates/settings.php:8 templates/settings.php:22
msgid "Mount point"
-msgstr ""
+msgstr "Точка на монтирање"
#: templates/settings.php:9
msgid "Backend"
-msgstr ""
+msgstr "Админ"
#: templates/settings.php:10
msgid "Configuration"
-msgstr ""
+msgstr "Конфигурација"
#: templates/settings.php:11
msgid "Options"
-msgstr ""
+msgstr "Опции"
#: templates/settings.php:12
msgid "Applicable"
-msgstr ""
+msgstr "Применливо"
#: templates/settings.php:27
msgid "Add mount point"
-msgstr ""
+msgstr "Додади точка на монтирање"
#: templates/settings.php:85
msgid "None set"
-msgstr ""
+msgstr "Ништо поставено"
#: templates/settings.php:86
msgid "All Users"
-msgstr ""
+msgstr "Сите корисници"
#: templates/settings.php:87
msgid "Groups"
@@ -99,22 +100,22 @@ msgid "Users"
msgstr "Корисници"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Избриши"
#: templates/settings.php:124
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Овозможи надворешни за корисници"
#: templates/settings.php:125
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Дозволи им на корисниците да монтираат свои надворешни дискови"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL root сертификати"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Увези"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 99f5454f5a5..51205c77b2c 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:31+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +20,30 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Лозинка"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr ""
+msgstr "Прати"
-#: templates/public.php:9
+#: templates/public.php:17
#, php-format
msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s ја сподели папката %s со Вас"
-#: templates/public.php:11
+#: templates/public.php:19
#, php-format
msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s ја сподели датотеката %s со Вас"
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:22 templates/public.php:38
msgid "Download"
-msgstr ""
+msgstr "Преземи"
-#: templates/public.php:29
+#: templates/public.php:37
msgid "No preview available for"
-msgstr ""
+msgstr "Нема достапно преглед за"
-#: templates/public.php:37
+#: templates/public.php:43
msgid "web services under your control"
-msgstr ""
+msgstr "веб сервиси под Ваша контрола"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index c611ab40b13..bbe751713aa 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:19+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +20,24 @@ msgstr ""
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
-msgstr ""
+msgstr "Истечи ги сите верзии"
#: js/versions.js:16
msgid "History"
-msgstr ""
+msgstr "Историја"
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Версии"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки"
#: templates/settings.php:3
msgid "Files Versioning"
-msgstr ""
+msgstr "Верзии на датотеки"
#: templates/settings.php:4
msgid "Enable"
-msgstr ""
+msgstr "Овозможи"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 4be426c9be1..a315a725a96 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:04+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,57 +18,57 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: app.php:285
+#: app.php:287
msgid "Help"
msgstr "Помош"
-#: app.php:292
+#: app.php:294
msgid "Personal"
msgstr "Лично"
-#: app.php:297
+#: app.php:299
msgid "Settings"
msgstr "Параметри"
-#: app.php:302
+#: app.php:304
msgid "Users"
msgstr "Корисници"
-#: app.php:309
+#: app.php:311
msgid "Apps"
-msgstr ""
+msgstr "Аппликации"
-#: app.php:311
+#: app.php:313
msgid "Admin"
-msgstr ""
+msgstr "Админ"
-#: files.php:332
+#: files.php:366
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Преземање во ZIP е исклучено"
-#: files.php:333
+#: files.php:367
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Датотеките треба да се симнат една по една."
-#: files.php:333 files.php:358
+#: files.php:367 files.php:392
msgid "Back to Files"
-msgstr ""
+msgstr "Назад кон датотеки"
-#: files.php:357
+#: files.php:391
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Избраните датотеки се преголеми за да се генерира zip."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Апликацијата не е овозможена"
#: json.php:39 json.php:64 json.php:77 json.php:89
msgid "Authentication error"
-msgstr ""
+msgstr "Грешка во автентикација"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Жетонот е истечен. Ве молам превчитајте ја страницата."
#: search/provider/file.php:17 search/provider/file.php:35
msgid "Files"
@@ -79,74 +80,74 @@ msgstr "Текст"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "Слики"
#: template.php:103
msgid "seconds ago"
-msgstr ""
+msgstr "пред секунди"
#: template.php:104
msgid "1 minute ago"
-msgstr ""
+msgstr "пред 1 минута"
#: template.php:105
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "пред %d минути"
#: template.php:106
msgid "1 hour ago"
-msgstr ""
+msgstr "пред 1 час"
#: template.php:107
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "пред %d часови"
#: template.php:108
msgid "today"
-msgstr ""
+msgstr "денеска"
#: template.php:109
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
#: template.php:110
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "пред %d денови"
#: template.php:111
msgid "last month"
-msgstr ""
+msgstr "минатиот месец"
#: template.php:112
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "пред %d месеци"
#: template.php:113
msgid "last year"
-msgstr ""
+msgstr "минатата година"
#: template.php:114
msgid "years ago"
-msgstr ""
+msgstr "пред години"
#: updater.php:75
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>"
#: updater.php:77
msgid "up to date"
-msgstr ""
+msgstr "ажурно"
#: updater.php:80
msgid "updates check is disabled"
-msgstr ""
+msgstr "проверката за ажурирања е оневозможена"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Не можам да најдам категорија „%s“"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index b295cb7b667..3195e2e0539 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 13:39+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +22,19 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Неможам да вчитам листа од App Store"
#: ajax/creategroup.php:10
msgid "Group already exists"
-msgstr ""
+msgstr "Групата веќе постои"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr ""
+msgstr "Неможе да додадам група"
#: ajax/enableapp.php:12
msgid "Could not enable app. "
-msgstr ""
+msgstr "Неможе да овозможам апликација."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -53,15 +54,15 @@ msgstr "неправилно барање"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
-msgstr ""
+msgstr "Неможе да избришам група"
#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "Грешка во автентикација"
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr ""
+msgstr "Неможам да избришам корисник"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -69,17 +70,17 @@ msgstr "Јазикот е сменет"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Администраторите неможе да се избришат себеси од админ групата"
#: ajax/togglegroups.php:28
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Неможе да додадам корисник во група %s"
#: ajax/togglegroups.php:34
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Неможе да избришам корисник од група %s"
#: js/apps.js:28 js/apps.js:67
msgid "Disable"
@@ -103,7 +104,7 @@ msgstr "Додадете ја Вашата апликација"
#: templates/apps.php:11
msgid "More Apps"
-msgstr ""
+msgstr "Повеќе аппликации"
#: templates/apps.php:27
msgid "Select an App"
@@ -115,94 +116,114 @@ msgstr "Види ја страницата со апликации на apps.own
#: templates/apps.php:32
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Документација"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Корисничка документација"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Управување со големи датотеки"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Администраторска документација"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Постави прашање"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Документација на интернет"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Проблем при поврзување со базата за помош"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Форум"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Оди таму рачно."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Одговор"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Комерцијална подршка"
#: templates/personal.php:8
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Десктоп и мобилник клиенти за синхронизирање"
+msgid "Clients"
+msgstr "Клиенти"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Преземање"
+msgid "Download Desktop Clients"
+msgstr "Преземи клиенти за десктоп"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Преземи клиент за Андроид"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Преземи iOS клиент"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Лозинка"
+
+#: templates/personal.php:22
msgid "Your password was changed"
-msgstr ""
+msgstr "Вашата лозинка беше променета."
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Вашата лозинка неможе да се смени"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Моментална лозинка"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Нова лозинка"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "прикажи"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Вашата адреса за е-пошта"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Јазик"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "користете ја оваа адреса во менаџерот за датотеки да се поврзете со Вашиот ownCloud"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Користете ја оваа адреса да "
-#: templates/personal.php:61
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Верзија"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -210,16 +231,12 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/users.php:21 templates/users.php:76
msgid "Name"
msgstr "Име"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Лозинка"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Групи"
@@ -238,7 +255,7 @@ msgstr "Останато"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "Администратор на група"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 126d33adf67..3b3498bce1c 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -3,168 +3,182 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
+"PO-Revision-Date: 2012-12-28 09:25+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: templates/settings.php:8
-msgid "Host"
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:11
msgid ""
-"You can omit the protocol, except you require SSL. Then start with ldaps://"
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:15
+msgid "Host"
+msgstr "Домаќин"
+
+#: templates/settings.php:15
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://"
+
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
-msgstr ""
+msgstr "Лозинка"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 7392ade6853..20fbb4d7b33 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski <glisha@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
+"PO-Revision-Date: 2012-12-28 09:21+0000\n"
+"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 1de42e3e9c3..f4c24535347 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -119,29 +119,29 @@ msgstr "Lihat halaman applikasi di apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentasi"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Mengurus Fail Besar"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Tanya soalan"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Masalah menghubung untuk membantu pengkalan data"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Pergi ke sana secara manual"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Jawapan"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -149,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Klien Selarian untuk Desktop dan Mobile"
+msgid "Clients"
+msgstr "klien"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Muat turun"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Kata laluan "
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Gagal mengubah kata laluan anda "
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Kata laluan semasa"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Kata laluan baru"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "Papar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Ubah kata laluan"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Emel"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Alamat emel anda"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Bantu terjemah"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "guna alamat ini untuk menyambung owncloud anda dalam pengurus fail anda"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,10 +238,6 @@ msgstr ""
msgid "Name"
msgstr "Nama"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Kata laluan "
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Kumpulan"
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index e0ec2850865..4509f10da64 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index b0d74e1bab3..2974263352c 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index ab234540e25..96e64f4b1a8 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -122,29 +122,29 @@ msgstr "Se applikasjonens side på apps.owncloud.org"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentasjon"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Håndtere store filer"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Still et spørsmål"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemer med å koble til hjelp-databasen"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Gå dit manuelt"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Svar"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -152,62 +152,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Klienter for datamaskiner og mobile enheter"
+msgid "Clients"
+msgstr "Klienter"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Last ned"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Passord"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Passord har blitt endret"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Kunne ikke endre passordet ditt"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Nåværende passord"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nytt passord"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "vis"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Endre passord"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Din e-postadresse"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Oppi epostadressen du vil tilbakestille passordet for"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Bidra til oversettelsen"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "bruk denne adressen for å koble til din ownCloud gjennom filhåndtereren"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -221,10 +241,6 @@ msgstr ""
msgid "Name"
msgstr "Navn"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Passord"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupper"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 1ebfbe8b544..b415afa31aa 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-31 00:01+0100\n"
-"PO-Revision-Date: 2012-10-30 13:08+0000\n"
-"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Passord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppefilter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Bruk TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ikke anbefalt, bruk kun for testing"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En endring tømmer bufferen."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 8029f4ff58a..c3f368c7777 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 4dd97cac611..322c4e3bbf4 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 17:28+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,26 +34,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Gebruiker %s deelde een bestand met u"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Gebruiker %s deelde een map met u"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -175,8 +175,8 @@ msgid "The object type is not specified."
msgstr "Het object type is niet gespecificeerd."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Fout"
@@ -188,7 +188,7 @@ msgstr "De app naam is niet gespecificeerd."
msgid "The required file {file} is not installed!"
msgstr "Het vereiste bestand {file} is niet geïnstalleerd!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
@@ -216,22 +216,22 @@ msgstr "Deel met"
msgid "Share with link"
msgstr "Deel met link"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Wachtwoord beveiliging"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Wachtwoord"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "E-mail link naar persoon"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Versturen"
#: js/share.js:177
msgid "Set expiration date"
@@ -285,25 +285,25 @@ msgstr "verwijderen"
msgid "share"
msgstr "deel"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de verval datum"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Versturen ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "E-mail verzonden"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -325,8 +325,8 @@ msgstr "Reset e-mail verstuurd."
msgid "Request failed!"
msgstr "Verzoek mislukt!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Gebruikersnaam"
@@ -415,44 +415,44 @@ msgstr "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het .htacces
msgid "Create an <strong>admin account</strong>"
msgstr "Maak een <strong>beheerdersaccount</strong> aan"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Geavanceerd"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Gegevensmap"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configureer de database"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "zal gebruikt worden"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Gebruiker database"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Wachtwoord database"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Naam database"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Database server"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Installatie afronden"
@@ -540,29 +540,29 @@ msgstr "Webdiensten in eigen beheer"
msgid "Log out"
msgstr "Afmelden"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatische aanmelding geweigerd!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Uw wachtwoord vergeten?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "onthoud gegevens"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Meld je aan"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index dcc92f2a2cd..73a37735f70 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2012.
# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-21 00:09+0100\n"
+"PO-Revision-Date: 2012-12-20 17:34+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "Fout tijdens het configureren van Google Drive opslag"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren."
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +101,7 @@ msgid "Users"
msgstr "Gebruikers"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Verwijder"
@@ -112,10 +113,10 @@ msgstr "Externe opslag voor gebruikers activeren"
msgid "Allow users to mount their own external storage"
msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL root certificaten"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Importeer root certificaat"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 1b28da61ba6..52bcdb4ed53 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2012.
# <bart.formosus@gmail.com>, 2011.
# <bramdv@me.com>, 2012.
# <didi.debian@cknow.org>, 2012.
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 17:37+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,29 +126,29 @@ msgstr "Zie de applicatiepagina op apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentatie"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Gebruikersdocumentatie"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Instellingen voor grote bestanden"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Beheerdersdocumentatie"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Stel een vraag"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Online documentatie"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemen bij het verbinden met de helpdatabank."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Ga er zelf heen."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Beantwoord"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Commerciële ondersteuning"
#: templates/personal.php:8
#, php-format
@@ -155,62 +156,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "U heeft <strong>%s</strong> van de <strong>%s</strong> beschikbaren gebruikt"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop en mobiele synchronisatie applicaties"
+msgid "Clients"
+msgstr "Klanten"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Download"
+msgid "Download Desktop Clients"
+msgstr "Download Desktop Clients"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Download Android Client"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Download iOS Client"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Je wachtwoord is veranderd"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Niet in staat om uw wachtwoord te wijzigen"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Huidig wachtwoord"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "weergeven"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Wijzig wachtwoord"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-mailadres"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Uw e-mailadres"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Taal"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Help met vertalen"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Gebruik het bovenstaande adres om verbinding te maken met ownCloud in uw bestandbeheerprogramma"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Versie"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -224,10 +245,6 @@ msgstr "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_bla
msgid "Name"
msgstr "Naam"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Wachtwoord"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Groepen"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e6819a76937..840adfacc66 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2012.
# <lenny@weijl.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 09:35+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 17:25+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Basis DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Gebruikers DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Wachtwoord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Gebruikers Login Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Gebruikers Lijst Filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "zonder een placeholder, bijv. \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Groep Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Poort"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Basis Gebruikers Structuur"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis Groupen Structuur"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Groepslid associatie"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Gebruik TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Gebruik niet voor SSL connecties, deze mislukken."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Schakel SSL certificaat validatie uit."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Gebruikers Schermnaam Veld"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Groep Schermnaam Veld"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in seconden. Een verandering maakt de cache leeg."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Help"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index a9532440298..81dd911eef5 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Koot <meneer@tken.net>, 2012.
# Richard Bos <radoeka@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 15:21+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 17:23+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud zal de inloggegevens naar deze URL als geïnterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index b38152f949c..b62189d236d 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Spør om noko"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problem ved tilkopling til hjelpedatabasen."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Gå der på eigen hand."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Svar"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "Klientar"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Last ned"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Passord"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Klarte ikkje å endra passordet"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Passord"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nytt passord"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "vis"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Endra passord"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Epost"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Din epost addresse"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Hjelp oss å oversett"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "bruk denne adressa for å kopla til ownCloud i filhandsamaren din"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr ""
msgid "Name"
msgstr "Namn"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Passord"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupper"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 2d5b008d920..7f064cb1e25 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 417e761a789..0c942635476 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index a4f159a9c57..aa5ccaa9439 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -116,29 +116,29 @@ msgstr "Agacha la pagina d'applications en cò de apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentacion"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Al bailejar de fichièrs pesucasses"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Respond a una question"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemas al connectar de la basa de donadas d'ajuda"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Vas çai manualament"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Responsa"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "Practica"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Avalcarga"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Senhal"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Ton senhal a cambiat"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Pas possible de cambiar ton senhal"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Senhal en cors"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Senhal novèl"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mòstra"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Cambia lo senhal"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Corrièl"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Ton adreiça de corrièl"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Lenga"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ajuda a la revirada"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "utiliza aquela adreiça per te connectar al ownCloud amb ton explorator de fichièrs"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -215,10 +235,6 @@ msgstr ""
msgid "Name"
msgstr "Nom"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Senhal"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grops"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index e4321202c2f..29bd7864d7e 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index c7f850ce179..5d411e9dab1 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index bfca95f3979..494afd04759 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 07:16+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 09:39+0000\n"
+"Last-Translator: emc <mplichta@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,26 +30,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Użytkownik %s współdzieli plik z tobą"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Uzytkownik %s wspóldzieli folder z toba"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -216,7 +216,7 @@ msgstr "Współdziel z link"
msgid "Password protect"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Hasło"
@@ -321,8 +321,8 @@ msgstr "Wyślij zresetowany email."
msgid "Request failed!"
msgstr "Próba nieudana!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Nazwa użytkownika"
@@ -411,44 +411,44 @@ msgstr "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu
msgid "Create an <strong>admin account</strong>"
msgstr "Tworzenie <strong>konta administratora</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Zaawansowane"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Katalog danych"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Konfiguracja bazy danych"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "zostanie użyte"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Użytkownik bazy danych"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Hasło do bazy danych"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nazwa bazy danych"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Obszar tabel bazy danych"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Komputer bazy danych"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Zakończ konfigurowanie"
@@ -554,11 +554,11 @@ msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie."
msgid "Lost your password?"
msgstr "Nie pamiętasz hasła?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "Zapamiętanie"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Zaloguj"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index beb685551e5..bd13e836e65 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-04 00:06+0100\n"
-"PO-Revision-Date: 2012-12-03 10:16+0000\n"
-"Last-Translator: Thomasso <tomekde@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -125,29 +125,29 @@ msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentacja"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Zarządzanie dużymi plikami"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Zadaj pytanie"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problem z połączeniem z bazą danych."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Przejdź na stronę ręcznie."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Odpowiedź"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -155,62 +155,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Klienci synchronizacji"
+msgid "Clients"
+msgstr "Klienci"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Ściągnij"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Hasło"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Twoje hasło zostało zmienione"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Nie można zmienić hasła"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Bieżące hasło"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nowe hasło"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "Wyświetlanie"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Zmień hasło"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Adres e-mail użytkownika"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Język"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Pomóż w tłumaczeniu"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Proszę użyć tego adresu, aby uzyskać dostęp do usługi ownCloud w menedżerze plików."
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -224,10 +244,6 @@ msgstr "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\
msgid "Name"
msgstr "Nazwa"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Hasło"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupy"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index d351bc786e2..25b35d770df 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -4,169 +4,183 @@
#
# Translators:
# Cyryl Sochacki <>, 2012.
+# Marcin Małecki <gerber@tkdami.net>, 2012.
# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 15:50+0000\n"
-"Last-Translator: Paweł Ciecierski <pciecierski@gmail.com>\n"
+"POT-Creation-Date: 2012-12-19 00:03+0100\n"
+"PO-Revision-Date: 2012-12-18 18:12+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Baza DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Użytkownik DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Hasło"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtr logowania użytkownika"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lista filtrów użytkownika"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Grupa filtrów"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Drzewo bazy użytkowników"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Drzewo bazy grup"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Członek grupy stowarzyszenia"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Użyj TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Nie używaj SSL dla połączeń, jeśli się nie powiedzie."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Wielkość liter serwera LDAP (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Niezalecane, użyj tylko testowo."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Pole wyświetlanej nazwy użytkownika"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Pole wyświetlanej nazwy grupy"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "w bajtach"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 9b783571dfb..f745f1f1320 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
+# Marcin Małecki <gerber@tkdami.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 13:30+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 11:39+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 9b602355608..f90f3c11162 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 554396a6fe0..de4bd2f3523 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 46365b77ad8..77261b85639 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index a8b2a98a550..67cb06fbd6d 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: FredMaranhao <fred.maranhao@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -124,29 +124,29 @@ msgstr "Ver página do aplicativo em apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentação"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gerênciando Arquivos Grandes"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Faça uma pergunta"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemas ao conectar na base de dados."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Ir manualmente."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Resposta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -154,62 +154,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Sincronizando Desktop e Mobile"
+msgid "Clients"
+msgstr "Clientes"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Senha"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Sua senha foi alterada"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Não é possivel alterar a sua senha"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Senha atual"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nova senha"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mostrar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Alterar senha"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Seu endereço de email"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha um endereço de email para habilitar a recuperação de senha"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "use este endereço para se conectar ao seu ownCloud no seu gerenciador de arquvos"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -223,10 +243,6 @@ msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blan
msgid "Name"
msgstr "Nome"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Senha"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupos"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index ddfc711b8ea..fdd9c02d90a 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 17:35+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Usuário"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Senha"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de Login de Usuário"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtro de Lista de Usuário"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define filtro a aplicar ao obter usuários."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de Grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar ao obter grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Árvore de Usuário Base"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árvore de Grupo Base"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associação Grupo-Membro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Não use-o para conexões SSL, pois falhará."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sensível à caixa alta (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desligar validação de certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, use somente para testes."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo Nome de Exibição de Usuário"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo Nome de Exibição de Grupo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma mudança esvaziará o cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index 5e55946786a..febd61f9ee5 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-12 00:01+0100\n"
-"PO-Revision-Date: 2012-11-11 13:40+0000\n"
-"Last-Translator: thoriumbr <thoriumbr@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "URL do WebDAV: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 2a05167e0de..92daefee097 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 01:27+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,26 +26,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "O utilizador %s partilhou um ficheiro consigo."
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "O utilizador %s partilhou uma pasta consigo."
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -212,18 +212,18 @@ msgstr "Partilhar com link"
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Palavra chave"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Enviar o link por e-mail"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: js/share.js:177
msgid "Set expiration date"
@@ -291,11 +291,11 @@ msgstr "Erro ao aplicar a data de expiração"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "A Enviar..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "E-mail enviado com sucesso!"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -317,8 +317,8 @@ msgstr "E-mail de reinicialização enviado."
msgid "Request failed!"
msgstr "O pedido falhou!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Utilizador"
@@ -407,44 +407,44 @@ msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acess
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta administrativa</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avançado"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Pasta de dados"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configure a base de dados"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "vai ser usada"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Utilizador da base de dados"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Password da base de dados"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nome da base de dados"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Tablespace da base de dados"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Host da base de dados"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Acabar instalação"
@@ -550,11 +550,11 @@ msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
msgid "Lost your password?"
msgstr "Esqueceu a sua password?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Entrar"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 1f14f0cbdf5..6319794b213 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012.
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 01:29+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "Erro ao configurar o armazenamento do Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 38b4491aa64..eee0eb64fd7 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-20 23:51+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -120,29 +120,29 @@ msgstr "Ver a página da aplicação em apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documentação"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Documentação de Utilizador"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gestão de ficheiros grandes"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Documentação de administrador."
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Coloque uma questão"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Documentação Online"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problemas ao ligar à base de dados de ajuda"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Fórum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Vá lá manualmente"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Resposta"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Suporte Comercial"
#: templates/personal.php:8
#, php-format
@@ -150,62 +150,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clientes de sincronização desktop e móvel"
+msgid "Clients"
+msgstr "Clientes"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Transferir"
+msgid "Download Desktop Clients"
+msgstr "Transferir os clientes de sincronização"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Transferir o cliente android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Transferir o cliente iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Palavra-chave"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "A sua palavra-passe foi alterada"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Não foi possivel alterar a sua palavra-chave"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Palavra-chave actual"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nova palavra-chave"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "mostrar"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Alterar palavra-chave"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "endereço de email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "O seu endereço de email"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "utilize este endereço para ligar ao seu ownCloud através do seu gestor de ficheiros"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Versão"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,10 +239,6 @@ msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blan
msgid "Name"
msgstr "Nome"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Palavra-chave"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupos"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 07c6f1ca249..2ecb6bd3751 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-08 00:01+0100\n"
-"PO-Revision-Date: 2012-11-07 15:39+0000\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 01:25+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -22,153 +22,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Aviso:</b> O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Anfitrião"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN do utilizador"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "O DN to cliente "
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Palavra-passe"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de login de utilizador"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Utilizar filtro"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtrar por grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defina o filtro a aplicar, ao recuperar grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Base da árvore de utilizadores."
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base da árvore de grupos."
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associar utilizador ao grupo."
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Não use para ligações SSL, irá falhar."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desligar a validação de certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, utilizado apenas para testes!"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Mostrador do nome de utilizador."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Mostrador do nome do grupo."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma alteração esvazia a cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index efb197aacbd..f34c1b223df 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <daniel@mouxy.net>, 2012.
# Helder Meneses <helder.meneses@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-14 00:02+0100\n"
-"PO-Revision-Date: 2012-11-13 12:27+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-20 23:46+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "Endereço WebDAV: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "O ownCloud vai enviar as credenciais para este URL. Todos os códigos http 401 e 403 serão interpretados como credenciais inválidas, todos os restantes códigos http serão interpretados como credenciais correctas."
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 1e11f35b491..1596bc408e3 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -7,13 +7,14 @@
# Dimon Pockemon <>, 2012.
# Eugen Mihalache <eugemjj@gmail.com>, 2012.
# <g.ciprian@osn.ro>, 2012.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 00:19+0000\n"
+"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Tipul de categorie nu este prevazut"
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -61,7 +62,7 @@ msgstr "Această categorie deja există:"
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Tipul obiectului nu este prevazut"
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
@@ -97,11 +98,11 @@ msgstr "1 minut în urmă"
#: js/js.js:706
msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} minute in urma"
#: js/js.js:707
msgid "1 hour ago"
-msgstr ""
+msgstr "Acum o ora"
#: js/js.js:708
msgid "{hours} hours ago"
@@ -117,7 +118,7 @@ msgstr "ieri"
#: js/js.js:711
msgid "{days} days ago"
-msgstr ""
+msgstr "{days} zile in urma"
#: js/js.js:712
msgid "last month"
@@ -165,8 +166,8 @@ msgid "The object type is not specified."
msgstr ""
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Eroare"
@@ -178,7 +179,7 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Eroare la partajare"
@@ -192,11 +193,11 @@ msgstr "Eroare la modificarea permisiunilor"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Distribuie cu tine si grupul {group} de {owner}"
#: js/share.js:153
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Distribuie cu tine de {owner}"
#: js/share.js:158
msgid "Share with"
@@ -206,11 +207,11 @@ msgstr "Partajat cu"
msgid "Share with link"
msgstr "Partajare cu legătură"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Protejare cu parolă"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Parola"
@@ -233,7 +234,7 @@ msgstr "Data expirării"
#: js/share.js:210
msgid "Share via email:"
-msgstr ""
+msgstr "Distribuie prin email:"
#: js/share.js:212
msgid "No people found"
@@ -245,7 +246,7 @@ msgstr "Repartajarea nu este permisă"
#: js/share.js:275
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Distribuie in {item} si {user}"
#: js/share.js:296
msgid "Unshare"
@@ -275,23 +276,23 @@ msgstr "ștergere"
msgid "share"
msgstr "partajare"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
msgstr ""
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
msgstr ""
@@ -309,14 +310,14 @@ msgstr "Vei primi un mesaj prin care vei putea reseta parola via email"
#: lostpassword/templates/lostpassword.php:5
msgid "Reset email send."
-msgstr ""
+msgstr "Resetarea emailu-lui trimisa."
#: lostpassword/templates/lostpassword.php:8
msgid "Request failed!"
-msgstr ""
+msgstr "Solicitarea nu a reusit"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Utilizator"
@@ -384,13 +385,13 @@ msgstr "Avertisment de securitate"
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL"
#: templates/installation.php:26
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau"
#: templates/installation.php:32
msgid ""
@@ -405,44 +406,44 @@ msgstr "Directorul tău de date și fișierele tale probabil sunt accesibile pri
msgid "Create an <strong>admin account</strong>"
msgstr "Crează un <strong>cont de administrator</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avansat"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Director date"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configurează baza de date"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "vor fi folosite"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Utilizatorul bazei de date"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Parola bazei de date"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Numele bazei de date"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Tabela de spațiu a bazei de date"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Bază date"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Finalizează instalarea"
@@ -530,29 +531,29 @@ msgstr "servicii web controlate de tine"
msgid "Log out"
msgstr "Ieșire"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Logare automata respinsa"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Ai uitat parola?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "amintește"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Autentificare"
@@ -570,14 +571,14 @@ msgstr "următorul"
#: templates/verify.php:5
msgid "Security Warning!"
-msgstr ""
+msgstr "Advertisment de Securitate"
#: templates/verify.php:6
msgid ""
"Please verify your password. <br/>For security reasons you may be "
"occasionally asked to enter your password again."
-msgstr ""
+msgstr "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou"
#: templates/verify.php:16
msgid "Verify"
-msgstr ""
+msgstr "Verifica"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index a1bd981cb9b..d61dc617703 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -7,13 +7,14 @@
# Dimon Pockemon <>, 2012.
# Eugen Mihalache <eugemjj@gmail.com>, 2012.
# <g.ciprian@osn.ro>, 2012.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 00:09+0000\n"
+"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Nicio eroare, fișierul a fost încărcat cu succes"
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: "
#: ajax/upload.php:23
msgid ""
@@ -56,11 +57,11 @@ msgstr "Eroare la scriere pe disc"
msgid "Files"
msgstr "Fișiere"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
msgstr "Anulează partajarea"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Șterge"
@@ -68,124 +69,124 @@ msgstr "Șterge"
msgid "Rename"
msgstr "Redenumire"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} deja exista"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
msgstr "înlocuire"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
msgstr "sugerează nume"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
msgstr "anulare"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
-msgstr ""
+msgstr "inlocuit {new_name}"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
msgstr "Anulează ultima acțiune"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "{new_name} inlocuit cu {old_name}"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
-msgstr ""
+msgstr "nedistribuit {files}"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
-msgstr ""
+msgstr "Sterse {files}"
#: js/files.js:33
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "se generază fișierul ZIP, va dura ceva timp."
-#: js/files.js:218
+#: js/files.js:212
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
-#: js/files.js:218
+#: js/files.js:212
msgid "Upload Error"
msgstr "Eroare la încărcare"
-#: js/files.js:235
+#: js/files.js:229
msgid "Close"
msgstr "Închide"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:248 js/files.js:362 js/files.js:392
msgid "Pending"
msgstr "În așteptare"
-#: js/files.js:274
+#: js/files.js:268
msgid "1 file uploading"
msgstr "un fișier se încarcă"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:271 js/files.js:325 js/files.js:340
msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} fisiere incarcate"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:343 js/files.js:376
msgid "Upload cancelled."
msgstr "Încărcare anulată."
-#: js/files.js:451
+#: js/files.js:445
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
-#: js/files.js:523
+#: js/files.js:515
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Nume de folder invalid. Numele este rezervat pentru OwnCloud"
-#: js/files.js:704
+#: js/files.js:699
msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} fisiere scanate"
-#: js/files.js:712
+#: js/files.js:707
msgid "error while scanning"
msgstr "eroare la scanarea"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:780 templates/index.php:66
msgid "Name"
msgstr "Nume"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:781 templates/index.php:77
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:782 templates/index.php:79
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:814
+#: js/files.js:801
msgid "1 folder"
-msgstr ""
+msgstr "1 folder"
-#: js/files.js:816
+#: js/files.js:803
msgid "{count} folders"
-msgstr ""
+msgstr "{count} foldare"
-#: js/files.js:824
+#: js/files.js:811
msgid "1 file"
-msgstr ""
+msgstr "1 fisier"
-#: js/files.js:826
+#: js/files.js:813
msgid "{count} files"
-msgstr ""
+msgstr "{count} fisiere"
#: templates/admin.php:5
msgid "File handling"
@@ -233,7 +234,7 @@ msgstr "Dosar"
#: templates/index.php:14
msgid "From link"
-msgstr ""
+msgstr "de la adresa"
#: templates/index.php:35
msgid "Upload"
@@ -243,28 +244,28 @@ msgstr "Încarcă"
msgid "Cancel upload"
msgstr "Anulează încărcarea"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Nimic aici. Încarcă ceva!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "Descarcă"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Fișierul încărcat este prea mare"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Fișierele sunt scanate, te rog așteptă."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "În curs de scanare"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 827d2b17ea9..3cfb1c4c4a0 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -4,13 +4,14 @@
#
# Translators:
# <g.ciprian@osn.ro>, 2012.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 05:14+0000\n"
+"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +19,43 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: app.php:285
+#: app.php:287
msgid "Help"
msgstr "Ajutor"
-#: app.php:292
+#: app.php:294
msgid "Personal"
msgstr "Personal"
-#: app.php:297
+#: app.php:299
msgid "Settings"
msgstr "Setări"
-#: app.php:302
+#: app.php:304
msgid "Users"
msgstr "Utilizatori"
-#: app.php:309
+#: app.php:311
msgid "Apps"
msgstr "Aplicații"
-#: app.php:311
+#: app.php:313
msgid "Admin"
msgstr "Admin"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
msgstr "Descărcarea ZIP este dezactivată."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr "Fișierele trebuie descărcate unul câte unul."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr "Înapoi la fișiere"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
@@ -80,7 +81,7 @@ msgstr "Text"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "Imagini"
#: template.php:103
msgid "seconds ago"
@@ -97,12 +98,12 @@ msgstr "%d minute în urmă"
#: template.php:106
msgid "1 hour ago"
-msgstr ""
+msgstr "Acum o ora"
#: template.php:107
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "%d ore in urma"
#: template.php:108
msgid "today"
@@ -124,7 +125,7 @@ msgstr "ultima lună"
#: template.php:112
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "%d luni in urma"
#: template.php:113
msgid "last year"
@@ -150,4 +151,4 @@ msgstr "verificarea după actualizări este dezactivată"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Cloud nu a gasit categoria \"%s\""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index f963f93caf9..98f2a2844e7 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -121,29 +121,29 @@ msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documetație"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gestionînd fișiere mari"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Întreabă"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Probleme de conectare la baza de date."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Pe cale manuală."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Răspuns"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -151,62 +151,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clienți de sincronizare pentru telefon mobil și desktop"
+msgid "Clients"
+msgstr "Clienți"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Descărcări"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Parolă"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Parola a fost modificată"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Imposibil de-ați schimbat parola"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Parola curentă"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Noua parolă"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "afișează"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Schimbă parola"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Adresa ta de email"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Limba"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Ajută la traducere"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "folosește această adresă pentru a te conecta la managerul tău de fișiere din ownCloud"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -220,10 +240,6 @@ msgstr "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank
msgid "Name"
msgstr "Nume"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Parolă"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupuri"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 8b79d7561fa..171e91b27d4 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -5,168 +5,182 @@
# Translators:
# Dumitru Ursu <>, 2012.
# <iuranemo@gmail.com>, 2012.
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 17:51+0000\n"
-"Last-Translator: iuranemo <iuranemo@gmail.com>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 05:09+0000\n"
+"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia"
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Gazdă"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN de bază"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN al utilizatorului"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Parolă"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtrare după Nume Utilizator"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtrarea după lista utilizatorilor"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "fără substituenți, d.e. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Fitrare Grup"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definește filtrele care se aplică, când se preiau grupurile."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Portul"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Arborele de bază al Utilizatorilor"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Arborele de bază al Grupurilor"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asocierea Grup-Membru"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Utilizează TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP insensibil la majuscule (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Oprește validarea certificatelor SSL "
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nu este recomandat, a se utiliza doar pentru testare."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Câmpul cu numele vizibil al utilizatorului"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Câmpul cu numele grupului"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "în octeți"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "în secunde. O schimbare curăță memoria tampon."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajutor"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 63c426cad9b..7c83e127d1c 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <laur.cristescu@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 05:17+0000\n"
+"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr ""
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "owncloud va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 9d3b7819139..cfaa71c6af5 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -10,6 +10,7 @@
# Nick Remeslennikov <homolibere@gmail.com>, 2012.
# <rasperepodvipodvert@gmail.com>, 2012.
# <semen@sam002.net>, 2012.
+# <sharov3@gmail.com>, 2012.
# <skoptev@ukr.net>, 2012.
# <tony.mccourin@gmail.com>, 2011.
# Victor Bravo <>, 2012.
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:17+0100\n"
-"PO-Revision-Date: 2012-12-13 15:49+0000\n"
-"Last-Translator: sam002 <semen@sam002.net>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 06:17+0000\n"
+"Last-Translator: adol <sharov3@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -126,29 +127,29 @@ msgstr "Смотрите дополнения на apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Документация"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Управление большими файлами"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Задать вопрос"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Проблема соединения с базой данных помощи."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Форум"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Войти самостоятельно."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Ответ"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -156,62 +157,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Клиенты синхронизации для рабочих станций и мобильных устройств"
+msgid "Clients"
+msgstr "Клиенты"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Загрузка"
+msgid "Download Desktop Clients"
+msgstr "Загрузка приложений для компьютера"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Загрузка Android-приложения"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Загрузка iOS-приложения"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Пароль"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Ваш пароль изменён"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Невозможно сменить пароль"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Текущий пароль"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Новый пароль"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "показать"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Сменить пароль"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "e-mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Ваш адрес электронной почты"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Язык"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Помочь с переводом"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "используйте данный адрес для подключения к ownCloud в вашем файловом менеджере"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Версия"
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -225,10 +246,6 @@ msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" t
msgid "Name"
msgstr "Имя"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Пароль"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Группы"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index b3dbb4c446e..5ab21a67d52 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -5,168 +5,182 @@
# Translators:
# <4671992@gmail.com>, 2012.
# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <semen@sam002.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 05:08+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 01:57+0000\n"
+"Last-Translator: sam002 <semen@sam002.net>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Внимание:</b> Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Сервер"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Базовый DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN пользователя"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Фильтр входа пользователей"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Фильтр списка пользователей"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Определяет фильтр для применения при получении пользователей."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без заполнителя, например: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Фильтр группы"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Определяет фильтр для применения при получении группы."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без заполнения, например \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "База пользовательского дерева"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "База группового дерева"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Ассоциация Группа-Участник"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Использовать TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Не используйте для соединений SSL"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Отключить проверку сертификата SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Не рекомендуется, используйте только для тестирования."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Поле отображаемого имени пользователя"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Поле отображаемого имени группы"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP для генерации имени группы ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Изменение очистит кэш."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index 19babe4e2ba..12e0350b328 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <sharov3@gmail.com>, 2012.
# <skoptev@ukr.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 12:27+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-12-27 00:04+0100\n"
+"PO-Revision-Date: 2012-12-26 06:19+0000\n"
+"Last-Translator: adol <sharov3@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index ede57ac4db4..c94ef7d516d 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 08:08+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,26 +21,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доступ к файлу"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доступ к папке"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Пользователь %s открыл Вам доступ к папке \"%s\". Она доступена для загрузки здесь: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -162,8 +162,8 @@ msgid "The object type is not specified."
msgstr "Тип объекта не указан."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Ошибка"
@@ -175,7 +175,7 @@ msgstr "Имя приложения не указано."
msgid "The required file {file} is not installed!"
msgstr "Требуемый файл {файл} не установлен!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Ошибка создания общего доступа"
@@ -203,22 +203,22 @@ msgstr "Сделать общим с"
msgid "Share with link"
msgstr "Опубликовать с ссылкой"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Защитить паролем"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Пароль"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Ссылка на адрес электронной почты"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Отправить"
#: js/share.js:177
msgid "Set expiration date"
@@ -272,25 +272,25 @@ msgstr "удалить"
msgid "share"
msgstr "сделать общим"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Пароль защищен"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Ошибка при отключении даты истечения срока действия"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Ошибка при установке даты истечения срока действия"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Отправка ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "Письмо отправлено"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -312,8 +312,8 @@ msgstr "Сброс отправки email."
msgid "Request failed!"
msgstr "Не удалось выполнить запрос!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Имя пользователя"
@@ -402,44 +402,44 @@ msgstr "Ваши каталоги данных и файлы, вероятно,
msgid "Create an <strong>admin account</strong>"
msgstr "Создать <strong>admin account</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Расширенный"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Папка данных"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Настроить базу данных"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "будет использоваться"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Пользователь базы данных"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Пароль базы данных"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Имя базы данных"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Табличная область базы данных"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Сервер базы данных"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Завершение настройки"
@@ -527,29 +527,29 @@ msgstr "веб-сервисы под Вашим контролем"
msgid "Log out"
msgstr "Выйти"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Автоматический вход в систему отклонен!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Если Вы недавно не меняли пароль, Ваш аккаунт может быть подвергнут опасности!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Пожалуйста, измените пароль, чтобы защитить ваш аккаунт еще раз."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Забыли пароль?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "запомнить"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Войти"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index b330223c8c2..acd6779fcd6 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-19 00:03+0100\n"
+"PO-Revision-Date: 2012-12-18 07:59+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "Ошибка отсутствует, файл загружен успе
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:"
#: ajax/upload.php:23
msgid ""
@@ -54,11 +54,11 @@ msgstr "Не удалось записать на диск"
msgid "Files"
msgstr "Файлы"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
msgstr "Скрыть"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Удалить"
@@ -66,39 +66,39 @@ msgstr "Удалить"
msgid "Rename"
msgstr "Переименовать"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
msgstr "{новое_имя} уже существует"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
msgstr "отмена"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
msgstr "подобрать название"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
msgstr "отменить"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
msgstr "заменено {новое_имя}"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
msgstr "отменить действие"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
msgstr "заменено {новое_имя} с {старое_имя}"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
msgstr "Cовместное использование прекращено {файлы}"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
msgstr "удалено {файлы}"
@@ -108,80 +108,80 @@ msgid ""
"allowed."
msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "Создание ZIP-файла, это может занять некоторое время."
-#: js/files.js:218
+#: js/files.js:209
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
-#: js/files.js:218
+#: js/files.js:209
msgid "Upload Error"
msgstr "Ошибка загрузки"
-#: js/files.js:235
+#: js/files.js:226
msgid "Close"
msgstr "Закрыть"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
msgid "Pending"
msgstr "Ожидающий решения"
-#: js/files.js:274
+#: js/files.js:265
msgid "1 file uploading"
msgstr "загрузка 1 файла"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
msgid "{count} files uploading"
msgstr "{количество} загружено файлов"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
msgid "Upload cancelled."
msgstr "Загрузка отменена"
-#: js/files.js:451
+#: js/files.js:442
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
-#: js/files.js:523
+#: js/files.js:512
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
msgstr "Некорректное имя папки. Нименование \"Опубликовано\" зарезервировано ownCloud"
-#: js/files.js:704
+#: js/files.js:693
msgid "{count} files scanned"
msgstr "{количество} файлов отсканировано"
-#: js/files.js:712
+#: js/files.js:701
msgid "error while scanning"
msgstr "ошибка при сканировании"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
msgid "Name"
msgstr "Имя"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
msgid "Size"
msgstr "Размер"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
msgid "Modified"
msgstr "Изменен"
-#: js/files.js:814
+#: js/files.js:803
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:816
+#: js/files.js:805
msgid "{count} folders"
msgstr "{количество} папок"
-#: js/files.js:824
+#: js/files.js:813
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:826
+#: js/files.js:815
msgid "{count} files"
msgstr "{количество} файлов"
@@ -241,28 +241,28 @@ msgstr "Загрузить "
msgid "Cancel upload"
msgstr "Отмена загрузки"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Здесь ничего нет. Загрузите что-нибудь!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "Загрузить"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Загрузка слишком велика"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Файлы сканируются, пожалуйста, подождите."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "Текущее сканирование"
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index f82e872da95..b93907dab57 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 10:27+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +46,14 @@ msgstr "Ошибка настройки хранилища Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее."
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Пользователи"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Удалить"
@@ -112,10 +112,10 @@ msgstr "Включить пользовательскую внешнюю сис
msgid "Allow users to mount their own external storage"
msgstr "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Корневые сертификаты SSL"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index fabcb827160..15f03042ae5 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 10:00+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "Язык изменен"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Администраторы не могут удалить сами себя из группы администраторов"
#: ajax/togglegroups.php:28
#, php-format
@@ -116,29 +116,29 @@ msgstr "Обратитесь к странице приложений на apps.
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Документация"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Документация пользователя"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Управление большими файлами"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Документация администратора"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Задать вопрос"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Документация online"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Проблемы, связанные с разделом Помощь базы данных"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Форум"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Сделать вручную."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Отслеживание ошибок"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Ответ"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Коммерческая поддержка"
#: templates/personal.php:8
#, php-format
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Клиенты синхронизации настольной и мобильной систем"
+msgid "Clients"
+msgstr "Клиенты"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Загрузка"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Загрузить клиент под Android "
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Загрузить клиент под iOS "
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Пароль"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Ваш пароль был изменен"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Невозможно изменить Ваш пароль"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Текущий пароль"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Новый пароль"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "показать"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Изменить пароль"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Электронная почта"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Адрес Вашей электронной почты"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Введите адрес электронной почты для возможности восстановления пароля"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Язык"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Помогите перевести"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Используйте этот адрес для соединения с Вашим ownCloud в файловом менеджере"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Версия"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -215,10 +235,6 @@ msgstr "Разработанный <a href=\"http://ownCloud.org/contact\" targe
msgid "Name"
msgstr "Имя"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Пароль"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Группы"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index a66fb2f7962..4a514279ab3 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-10-15 13:57+0000\n"
+"POT-Creation-Date: 2012-12-19 00:03+0100\n"
+"PO-Revision-Date: 2012-12-18 08:59+0000\n"
"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Хост"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "База DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN пользователя"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Фильтр имен пользователей"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Фильтр списка пользователей"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Задает фильтр, применяемый при получении пользователей."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Групповой фильтр"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Задает фильтр, применяемый при получении групп."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Базовое дерево пользователей"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Базовое дерево групп"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Связь член-группа"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Использовать TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Не используйте это SSL-соединений, это не будет выполнено."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Выключить проверку сертификата SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Не рекомендовано, используйте только для тестирования."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Поле, отображаемое как имя пользователя"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Поле, отображаемое как имя группы"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Изменение очищает кэш."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 9a511532b8e..5308dbe4c2d 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
# <skoptev@ukr.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 12:40+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-20 06:57+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 1bc5f94e9ad..6bfa8851760 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -118,29 +118,29 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "ලේඛන"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "විශාල ගොනු කළමණාකරනය"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "ප්‍රශ්ණයක් අසන්න"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "උදව් දත්ත ගබඩාව හා සම්බන්ධවීමේදී ගැටළු ඇතිවිය."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "ස්වශක්තියෙන් එතැනට යන්න"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "පිළිතුර"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "සේවාලාභීන්"
#: templates/personal.php:13
-msgid "Download"
-msgstr "භාගත කරන්න"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "මුරපදය"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "ඔබගේ මුර පදය වෙනස් කෙරුණි"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "මුර පදය වෙනස් කළ නොහැකි විය"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "වත්මන් මුරපදය"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "නව මුරපදය"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "ප්‍රදර්ශනය කිරීම"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "මුරපදය වෙනස් කිරීම"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "විද්‍යුත් තැපෑල"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "ඔබගේ විද්‍යුත් තැපෑල"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "භාෂාව"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "පරිවර්ථන සහය"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "ඔබගේ ගොනු කළමනාකරු ownCloudයට සම්බන්ධ කිරීමට මෙම ලිපිනය භාවිතා කරන්න"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\"
msgid "Name"
msgstr "නාමය"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "මුරපදය"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "සමූහය"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 065c1358f95..f44ac30b3ea 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-27 00:01+0200\n"
-"PO-Revision-Date: 2012-10-26 06:00+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "සත්කාරකය"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "මුර පදය"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "පරිශීලක පිවිසුම් පෙරහන"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "පරිශීලක ලැයිස්තු පෙරහන"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "කණ්ඩායම් පෙරහන"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "තොට"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLS භාවිතා කරන්න"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "උදව්"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index 957f987997a..b97c5beb1cc 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 04:50+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV යොමුව: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 111c6ee3ec7..7fc980b9834 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -120,29 +120,29 @@ msgstr "Pozrite si stránku aplikácií na apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentácia"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Správa veľkých súborov"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Opýtať sa otázku"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problémy s pripojením na databázu pomocníka."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Prejsť tam ručne."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Odpoveď"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -150,62 +150,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Klienti pre synchronizáciu"
+msgid "Clients"
+msgstr "Klienti"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Stiahnúť"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Heslo"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Heslo bolo zmenené"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Nie je možné zmeniť vaše heslo"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Aktuálne heslo"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nové heslo"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "zobraziť"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Vaša emailová adresa"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,10 +239,6 @@ msgstr "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komu
msgid "Name"
msgstr "Meno"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Heslo"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Skupiny"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index b11bc381cc6..fde4a583528 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-26 02:02+0200\n"
-"PO-Revision-Date: 2012-10-25 19:25+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Hostiteľ"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Základné DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Používateľské DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filter prihlásenia používateľov"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filter zoznamov používateľov"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definuje použitý filter, pre získanie používateľov."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znakov, napr. \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filter skupiny"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definuje použitý filter, pre získanie skupín."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Základný používateľský strom"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Základný skupinový strom"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociácia člena skupiny"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Použi TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Nepoužívajte pre pripojenie SSL, pripojenie zlyhá."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Vypnúť overovanie SSL certifikátu."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nie je doporučované, len pre testovacie účely."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Pole pre zobrazenia mena používateľa"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Pole pre zobrazenie mena skupiny"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud "
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "v bajtoch"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index d38bbf56f03..fe313b19276 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:41+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c792cfeb4b2..679277649aa 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 16:29+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +24,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Uporanik %s je dal datoteko v souporabo z vami"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Uporanik %s je dal mapo v souporabo z vami"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -210,18 +210,18 @@ msgstr "Omogoči souporabo s povezavo"
msgid "Password protect"
msgstr "Zaščiti z geslom"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Geslo"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Posreduj povezavo po e-pošti"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Pošlji"
#: js/share.js:177
msgid "Set expiration date"
@@ -289,11 +289,11 @@ msgstr "Napaka med nastavljanjem datuma preteka"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Pošiljam ..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "E-pošta je bila poslana"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -315,8 +315,8 @@ msgstr "E-pošta za ponastavitev je bila poslana."
msgid "Request failed!"
msgstr "Zahtevek je spodletel!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Uporabniško Ime"
@@ -405,44 +405,44 @@ msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen
msgid "Create an <strong>admin account</strong>"
msgstr "Ustvari <strong>skrbniški račun</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Napredne možnosti"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Mapa s podatki"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Nastavi podatkovno zbirko"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "bo uporabljen"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Uporabnik zbirke"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Geslo podatkovne zbirke"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Ime podatkovne zbirke"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Razpredelnica podatkovne zbirke"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Gostitelj podatkovne zbirke"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Dokončaj namestitev"
@@ -548,11 +548,11 @@ msgstr "Spremenite geslo za izboljšanje zaščite računa."
msgid "Lost your password?"
msgstr "Ali ste pozabili geslo?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "Zapomni si me"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Prijava"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 850dcb05426..f20fb0bad26 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 16:43+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,14 +47,14 @@ msgstr "Napaka nastavljanja shrambe Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index bc1c29f4808..9bf1d7498ab 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-09 00:11+0100\n"
-"PO-Revision-Date: 2012-12-07 23:52+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -119,29 +119,29 @@ msgstr "Obiščite spletno stran programa na apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentacija"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Upravljanje velikih datotek"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Zastavi vprašanje"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Težave med povezovanjem s podatkovno zbirko pomoči."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Ustvari povezavo ročno."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Odgovor"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -149,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Uporabljate <strong>%s</strong> od razpoložljivih <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Namizni in mobilni odjemalci za usklajevanje"
+msgid "Clients"
+msgstr "Stranka"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Prejmi"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Geslo"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Vaše geslo je spremenjeno"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Gesla ni mogoče spremeniti."
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Trenutno geslo"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Novo geslo"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "pokaži"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Spremeni geslo"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Elektronska pošta"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Vaš elektronski poštni naslov"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Pomagajte pri prevajanju"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Uporabite ta naslov za povezavo do ownCloud v upravljalniku datotek."
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,10 +238,6 @@ msgstr "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=
msgid "Name"
msgstr "Ime"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Geslo"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Skupine"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 115d6bd0b72..d34b56f8c01 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 17:41+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 16:46+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Opozorilo:</b> PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Gostitelj"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Osnovni DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Uporabnik DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Geslo"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Za anonimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filter prijav uporabnikov"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filter seznama uporabnikov"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filter skupin"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Določi filter za uporabo med pridobivanjem skupin."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Vrata"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Osnovno uporabniško drevo"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Osnovno drevo skupine"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Povezava člana skupine"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Uporabi TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Uporaba SSL za povezave bo spodletela."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Onemogoči potrditev veljavnosti potrdila SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Polje za uporabnikovo prikazano ime"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Polje za prikazano ime skupine"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "v bajtih"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "v sekundah. Sprememba izprazni predpomnilnik."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pomoč"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index f7f351238d5..b5b34116c6f 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 19:03+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 8857016c268..d5651cf5325 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 16fd4ec4207..3c0afbd378a 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index d3865a501b5..132bf6829ad 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 3d725b35b08..e608c443bcc 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 15:29+0000\n"
-"Last-Translator: Kostic <marko@evizo.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -117,29 +117,29 @@ msgstr "Погледајте страницу са програмима на app
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Документација"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Управљање великим датотекама"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Поставите питање"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Проблем у повезивању са базом помоћи"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Отиђите тамо ручно."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Одговор"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Стони и мобилни клијенти за усклађивање"
+msgid "Clients"
+msgstr "Клијенти"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Преузимање"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Лозинка"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Лозинка је промењена"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Не могу да изменим вашу лозинку"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Тренутна лозинка"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Нова лозинка"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "прикажи"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Измени лозинку"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Е-пошта"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Ваша адреса е-поште"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Ун"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Језик"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr " Помозите у превођењу"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "користите ову адресу да би се повезали на ownCloud путем менаџњера фајлова"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_bla
msgid "Name"
msgstr "Име"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Лозинка"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Групе"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index eaf9622b4f7..2af4aa92fab 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 41b10f06711..914fb17354e 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index d871fb7eb2b..1fa664360e9 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -116,29 +116,29 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Postavite pitanje"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problem u povezivanju sa bazom pomoći"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Otiđite tamo ručno."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Odgovor"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgid "Clients"
+msgstr "Klijenti"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Preuzmi"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Lozinka"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Ne mogu da izmenim vašu lozinku"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Trenutna lozinka"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nova lozinka"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "prikaži"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Izmeni lozinku"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "koristite ovu adresu da bi se povezali na ownCloud putem menadžnjera fajlova"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -215,10 +235,6 @@ msgstr ""
msgid "Name"
msgstr "Ime"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Lozinka"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupe"
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 6f56c8e03d0..47549f334d5 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index d478b05a6f8..9fe7b885a10 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 31c51f8afe6..ec20f3de3d6 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-26 00:11+0100\n"
+"PO-Revision-Date: 2012-12-25 08:10+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,26 +26,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Användare %s delade en fil med dig"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Användare %s delade en mapp med dig"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Användare %s delade filen \"%s\" med dig. Den finns att ladda ner här: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Användare %s delade mappen \"%s\" med dig. Den finns att ladda ner här: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -167,8 +167,8 @@ msgid "The object type is not specified."
msgstr "Objekttypen är inte specificerad."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Fel"
@@ -180,7 +180,7 @@ msgstr " Namnet på appen är inte specificerad."
msgid "The required file {file} is not installed!"
msgstr "Den nödvändiga filen {file} är inte installerad!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Fel vid delning"
@@ -208,22 +208,22 @@ msgstr "Delad med"
msgid "Share with link"
msgstr "Delad med länk"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Lösenord"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "E-posta länk till person"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Skicka"
#: js/share.js:177
msgid "Set expiration date"
@@ -277,25 +277,25 @@ msgstr "radera"
msgid "share"
msgstr "dela"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Skickar ..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "E-post skickat"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -317,8 +317,8 @@ msgstr "Återställ skickad e-post."
msgid "Request failed!"
msgstr "Begäran misslyckades!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Användarnamn"
@@ -407,44 +407,44 @@ msgstr "Din datakatalog och dina filer är förmodligen tillgängliga från Inte
msgid "Create an <strong>admin account</strong>"
msgstr "Skapa ett <strong>administratörskonto</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avancerat"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datamapp"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Konfigurera databasen"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "kommer att användas"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Databasanvändare"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Lösenord till databasen"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Databasnamn"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Databas tabellutrymme"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Databasserver"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Avsluta installation"
@@ -532,29 +532,29 @@ msgstr "webbtjänster under din kontroll"
msgid "Log out"
msgstr "Logga ut"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "Automatisk inloggning inte tillåten!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "Ändra genast lösenord för att säkra ditt konto."
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Glömt ditt lösenord?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "kom ihåg"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Logga in"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index e35ac8ae60d..0de3f3e3556 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-26 00:10+0100\n"
+"PO-Revision-Date: 2012-12-25 15:20+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +46,14 @@ msgstr "Fel vid konfigurering av Google Drive"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad."
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat."
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Användare"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Radera"
@@ -112,10 +112,10 @@ msgstr "Aktivera extern lagring för användare"
msgid "Allow users to mount their own external storage"
msgstr "Tillåt användare att montera egen extern lagring"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL rotcertifikat"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "Importera rotcertifikat"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 1f1645f74eb..93565b09c2e 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-04 00:06+0100\n"
-"PO-Revision-Date: 2012-12-03 19:44+0000\n"
+"POT-Creation-Date: 2012-12-26 00:11+0100\n"
+"PO-Revision-Date: 2012-12-25 07:58+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -122,29 +122,29 @@ msgstr "Se programsida på apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dokumentation"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Användardokumentation"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Hantering av stora filer"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Administratördokumentation"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Ställ en fråga"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Onlinedokumentation"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Problem med att ansluta till hjälpdatabasen."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Gå dit manuellt."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Bugtracker"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Svar"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Kommersiell support"
#: templates/personal.php:8
#, php-format
@@ -152,62 +152,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Synkroniseringsklienter för dator och mobil"
+msgid "Clients"
+msgstr "Kunder"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Ladda ner"
+msgid "Download Desktop Clients"
+msgstr "Ladda ner skrivbordsklienter"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Ladda ner klient för Android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Ladda ner klient för iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Lösenord"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Ditt lösenord har ändrats"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Kunde inte ändra ditt lösenord"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Nuvarande lösenord"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Nytt lösenord"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "visa"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Ändra lösenord"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Din e-postadress"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Hjälp att översätta"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "använd denna adress för att ansluta ownCloud till din filhanterare"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Version"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -221,10 +241,6 @@ msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">o
msgid "Name"
msgstr "Namn"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Lösenord"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Grupper"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 5bab62c0342..76ca9c76224 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 09:37+0000\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 19:54+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Server"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Start DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Användare DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Lösenord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filter logga in användare"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filter lista användare"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definierar filter att tillämpa vid listning av användare."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "utan platshållare, t.ex. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppfilter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definierar filter att tillämpa vid listning av grupper."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Bas för användare i katalogtjänst"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Bas för grupper i katalogtjänst"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Attribut för gruppmedlemmar"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Använd TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Använd inte för SSL-anslutningar, det kommer inte att fungera."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Stäng av verifiering av SSL-certifikat."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Rekommenderas inte, använd bara för test. "
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Attribut för användarnamn"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Attribut som används för att generera användarnamn i ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Attribut för gruppnamn"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Attribut som används för att generera gruppnamn i ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En förändring tömmer cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hjälp"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index ca0db7efe47..b2063cd23bc 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 07:44+0000\n"
+"POT-Creation-Date: 2012-12-26 00:10+0100\n"
+"PO-Revision-Date: 2012-12-25 08:03+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud kommer att skicka inloggningsuppgifterna till denna URL och tolkar http 401 och http 403 som fel och alla andra koder som korrekt."
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 4732ffd51c0..d06ae0bdd28 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -116,29 +116,29 @@ msgstr "apps.owncloud.com இல் செயலி பக்கத்தை ப
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "ஆவணமாக்கல்"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "பெரிய கோப்புகளை முகாமைப்படுத்தல்"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "வினா ஒன்றை கேட்க"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "தரவுதளத்தை இணைக்கும் உதவியில் பிரச்சினைகள்"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "கைமுறையாக அங்கு செல்க"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "விடை"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "desktop மற்றும் Mobile ஒத்திசைவு சேவைப் பயனாளர்"
+msgid "Clients"
+msgstr "வாடிக்கையாளர்கள்"
#: templates/personal.php:13
-msgid "Download"
-msgstr "பதிவிறக்குக"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "கடவுச்சொல்"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "தற்போதைய கடவுச்சொல்"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "புதிய கடவுச்சொல்"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "காட்டு"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "கடவுச்சொல்லை மாற்றுக"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "மின்னஞ்சல்"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "மொழி"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "மொழிபெயர்க்க உதவி"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "உங்களுடைய கோப்பு முகாமையில் உள்ள உங்களுடைய ownCloud உடன் இணைக்க இந்த முகவரியை பயன்படுத்தவும்"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -215,10 +235,6 @@ msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank
msgid "Name"
msgstr "பெயர்"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "கடவுச்சொல்"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "குழுக்கள்"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 2cd27957467..e98a09afa8c 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 09:09+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "ஓம்புனர்"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "தள DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "பயனாளர் DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "கடவுச்சொல்"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "துறை "
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "தள பயனாளர் மரம்"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "தள குழு மரம்"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "குழு உறுப்பினர் சங்கம்"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLS ஐ பயன்படுத்தவும்"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "SSL இணைப்பிற்கு பயன்படுத்தவேண்டாம், அது தோல்வியடையும்."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "குழுவின் காட்சி பெயர் புலம் "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "bytes களில் "
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "உதவி"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index 17c43a7f963..b74d36a8e43 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 05:29+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 74a33fc3ddd..0e7bec058d0 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -161,8 +161,8 @@ msgid "The object type is not specified."
msgstr ""
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr ""
@@ -174,7 +174,7 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr ""
@@ -202,11 +202,11 @@ msgstr ""
msgid "Share with link"
msgstr ""
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr ""
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -271,23 +271,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr ""
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
msgstr ""
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
msgstr ""
@@ -311,8 +311,8 @@ msgstr ""
msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr ""
@@ -401,44 +401,44 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr ""
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr ""
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr ""
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr ""
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr ""
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr ""
@@ -526,29 +526,29 @@ msgstr ""
msgid "Log out"
msgstr ""
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr ""
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr ""
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 8c56249c2da..feabdd922b8 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -110,76 +110,76 @@ msgstr ""
msgid "generating ZIP-file, it may take some time."
msgstr ""
-#: js/files.js:209
+#: js/files.js:212
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:209
+#: js/files.js:212
msgid "Upload Error"
msgstr ""
-#: js/files.js:226
+#: js/files.js:229
msgid "Close"
msgstr ""
-#: js/files.js:245 js/files.js:359 js/files.js:389
+#: js/files.js:248 js/files.js:362 js/files.js:392
msgid "Pending"
msgstr ""
-#: js/files.js:265
+#: js/files.js:268
msgid "1 file uploading"
msgstr ""
-#: js/files.js:268 js/files.js:322 js/files.js:337
+#: js/files.js:271 js/files.js:325 js/files.js:340
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:340 js/files.js:373
+#: js/files.js:343 js/files.js:376
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:442
+#: js/files.js:445
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:512
+#: js/files.js:515
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
msgstr ""
-#: js/files.js:693
+#: js/files.js:699
msgid "{count} files scanned"
msgstr ""
-#: js/files.js:701
+#: js/files.js:707
msgid "error while scanning"
msgstr ""
-#: js/files.js:774 templates/index.php:66
+#: js/files.js:780 templates/index.php:66
msgid "Name"
msgstr ""
-#: js/files.js:775 templates/index.php:77
+#: js/files.js:781 templates/index.php:77
msgid "Size"
msgstr ""
-#: js/files.js:776 templates/index.php:79
+#: js/files.js:782 templates/index.php:79
msgid "Modified"
msgstr ""
-#: js/files.js:803
+#: js/files.js:801
msgid "1 folder"
msgstr ""
-#: js/files.js:805
+#: js/files.js:803
msgid "{count} folders"
msgstr ""
-#: js/files.js:813
+#: js/files.js:811
msgid "1 file"
msgstr ""
-#: js/files.js:815
+#: js/files.js:813
msgid "{count} files"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 15063c507e8..ab55d6a46f0 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,14 +21,14 @@ msgstr ""
msgid "Encryption"
msgstr ""
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:6
+msgid "Enable Encryption"
msgstr ""
-#: templates/settings.php:5
+#: templates/settings.php:7
msgid "None"
msgstr ""
#: templates/settings.php:12
-msgid "Enable Encryption"
+msgid "Exclude the following file types from encryption"
msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 5ae592eab3e..8a8a5ba2b88 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -99,7 +99,7 @@ msgid "Users"
msgstr ""
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr ""
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c43a5b97938..71cbe713331 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 89da014ec69..b4e25ae6229 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
+#: js/settings-personal.js:31 templates/settings-personal.php:7
msgid "Expire all versions"
msgstr ""
@@ -29,7 +29,7 @@ msgstr ""
msgid "Versions"
msgstr ""
-#: templates/settings-personal.php:7
+#: templates/settings-personal.php:10
msgid "This will delete all existing backup versions of your files"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 1a2475ddde0..7c5c44e34b8 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: files.php:361
+#: files.php:365
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:362
+#: files.php:366
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
msgid "Back to Files"
msgstr ""
-#: files.php:386
+#: files.php:390
msgid "Selected files too large to generate zip file."
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 4606b3de7ef..0289d6568d1 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:17+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,28 +116,28 @@ msgid ""
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f6c93d44d74..ed05211033d 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,151 +18,164 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
+"experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will "
+"not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. uid=agent,"
"dc=example,dc=com. For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index edd944b0698..96663d5fb4e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,5 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials correct."
msgstr ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 63252d60677..cff6308811a 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-22 00:24+0100\n"
+"PO-Revision-Date: 2012-12-21 10:27+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถ
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini"
#: ajax/upload.php:23
msgid ""
@@ -54,11 +54,11 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
msgid "Files"
msgstr "ไฟล์"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
msgstr "ยกเลิกการแชร์ข้อมูล"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "ลบ"
@@ -66,39 +66,39 @@ msgstr "ลบ"
msgid "Rename"
msgstr "เปลี่ยนชื่อ"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
msgstr "{new_name} มีอยู่แล้วในระบบ"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
msgstr "แทนที่"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
msgstr "แนะนำชื่อ"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
msgstr "ยกเลิก"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
msgstr "แทนที่ {new_name} แล้ว"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
msgstr "เลิกทำ"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
msgstr "ยกเลิกการแชร์แล้ว {files} ไฟล์"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
msgstr "ลบไฟล์แล้ว {files} ไฟล์"
@@ -108,80 +108,80 @@ msgid ""
"allowed."
msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้"
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
-#: js/files.js:218
+#: js/files.js:212
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
-#: js/files.js:218
+#: js/files.js:212
msgid "Upload Error"
msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
-#: js/files.js:235
+#: js/files.js:229
msgid "Close"
msgstr "ปิด"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:248 js/files.js:362 js/files.js:392
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
-#: js/files.js:274
+#: js/files.js:268
msgid "1 file uploading"
msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:271 js/files.js:325 js/files.js:340
msgid "{count} files uploading"
msgstr "กำลังอัพโหลด {count} ไฟล์"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:343 js/files.js:376
msgid "Upload cancelled."
msgstr "การอัพโหลดถูกยกเลิก"
-#: js/files.js:451
+#: js/files.js:445
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
-#: js/files.js:523
+#: js/files.js:515
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
msgstr "ชื่อโฟลเดอร์ที่ใช้ไม่ถูกต้อง การใช้งาน \"ถูกแชร์\" ถูกสงวนไว้เฉพาะ Owncloud เท่านั้น"
-#: js/files.js:704
+#: js/files.js:699
msgid "{count} files scanned"
msgstr "สแกนไฟล์แล้ว {count} ไฟล์"
-#: js/files.js:712
+#: js/files.js:707
msgid "error while scanning"
msgstr "พบข้อผิดพลาดในระหว่างการสแกนไฟล์"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:780 templates/index.php:66
msgid "Name"
msgstr "ชื่อ"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:781 templates/index.php:77
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:782 templates/index.php:79
msgid "Modified"
msgstr "ปรับปรุงล่าสุด"
-#: js/files.js:814
+#: js/files.js:801
msgid "1 folder"
msgstr "1 โฟลเดอร์"
-#: js/files.js:816
+#: js/files.js:803
msgid "{count} folders"
msgstr "{count} โฟลเดอร์"
-#: js/files.js:824
+#: js/files.js:811
msgid "1 file"
msgstr "1 ไฟล์"
-#: js/files.js:826
+#: js/files.js:813
msgid "{count} files"
msgstr "{count} ไฟล์"
@@ -241,28 +241,28 @@ msgstr "อัพโหลด"
msgid "Cancel upload"
msgstr "ยกเลิกการอัพโหลด"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index d15a654e588..41350a3882c 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -118,29 +118,29 @@ msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.own
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "เอกสารคู่มือการใช้งาน"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "การจัดการไฟล์ขนาดใหญ่"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "สอบถามข้อมูล"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "ไปที่นั่นด้วยตนเอง"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "คำตอบ"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -148,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "โปรแกรมเชื่อมข้อมูลไฟล์สำหรับเครื่องเดสก์ท็อปและมือถือ"
+msgid "Clients"
+msgstr "ลูกค้า"
#: templates/personal.php:13
-msgid "Download"
-msgstr "ดาวน์โหลด"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "รหัสผ่าน"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "รหัสผ่านปัจจุบัน"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "รหัสผ่านใหม่"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "แสดง"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "อีเมล์"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "ที่อยู่อีเมล์ของคุณ"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "ภาษา"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "ช่วยกันแปล"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "ใช้ที่อยู่นี้ในการเชื่อมต่อกับบัญชี ownCloud ของคุณในเครื่องมือจัดการไฟล์ของคุณ"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,10 +237,6 @@ msgstr "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" tar
msgid "Name"
msgstr "ชื่อ"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "รหัสผ่าน"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "กลุ่ม"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 64ad07dbf6e..c8a7bd651bd 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 18:29+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "โฮสต์"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN ฐาน"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN ของผู้ใช้งาน"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "รหัสผ่าน"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "ตัวกรองข้อมูลกลุ่ม"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "พอร์ต"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "รายการผู้ใช้งานหลักแบบ Tree"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "รายการกลุ่มหลักแบบ Tree"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "ใช้ TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "ในหน่วยไบต์"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "ช่วยเหลือ"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 7a8ea7afe6b..e169eac8418 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 11:02+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 7c575fd5a3b..7058a258c8a 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 12:25+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +47,7 @@ msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Kategori türü desteklenmemektedir."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -61,7 +61,7 @@ msgstr "Bu kategori zaten mevcut: "
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Nesne türü desteklenmemektedir."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
@@ -89,55 +89,55 @@ msgstr "Ayarlar"
#: js/js.js:704
msgid "seconds ago"
-msgstr ""
+msgstr "saniye önce"
#: js/js.js:705
msgid "1 minute ago"
-msgstr ""
+msgstr "1 dakika önce"
#: js/js.js:706
msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} dakika önce"
#: js/js.js:707
msgid "1 hour ago"
-msgstr ""
+msgstr "1 saat önce"
#: js/js.js:708
msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} saat önce"
#: js/js.js:709
msgid "today"
-msgstr ""
+msgstr "bugün"
#: js/js.js:710
msgid "yesterday"
-msgstr ""
+msgstr "dün"
#: js/js.js:711
msgid "{days} days ago"
-msgstr ""
+msgstr "{days} gün önce"
#: js/js.js:712
msgid "last month"
-msgstr ""
+msgstr "geçen ay"
#: js/js.js:713
msgid "{months} months ago"
-msgstr ""
+msgstr "{months} ay önce"
#: js/js.js:714
msgid "months ago"
-msgstr ""
+msgstr "ay önce"
#: js/js.js:715
msgid "last year"
-msgstr ""
+msgstr "geçen yıl"
#: js/js.js:716
msgid "years ago"
-msgstr ""
+msgstr "yıl önce"
#: js/oc-dialogs.js:126
msgid "Choose"
@@ -162,11 +162,11 @@ msgstr "Tamam"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Nesne türü belirtilmemiş."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "Hata"
@@ -178,7 +178,7 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata "
@@ -188,7 +188,7 @@ msgstr ""
#: js/share.js:142
msgid "Error while changing permissions"
-msgstr ""
+msgstr "İzinleri değiştirirken hata oluştu"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
@@ -206,11 +206,11 @@ msgstr "ile Paylaş"
msgid "Share with link"
msgstr "Bağlantı ile paylaş"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "Şifre korunması"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "Parola"
@@ -221,7 +221,7 @@ msgstr ""
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Gönder"
#: js/share.js:177
msgid "Set expiration date"
@@ -229,19 +229,19 @@ msgstr "Son kullanma tarihini ayarla"
#: js/share.js:178
msgid "Expiration date"
-msgstr ""
+msgstr "Son kullanım tarihi"
#: js/share.js:210
msgid "Share via email:"
-msgstr ""
+msgstr "Eposta ile paylaş"
#: js/share.js:212
msgid "No people found"
-msgstr ""
+msgstr "Kişi bulunamadı"
#: js/share.js:239
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Tekrar paylaşmaya izin verilmiyor"
#: js/share.js:275
msgid "Shared in {item} with {user}"
@@ -253,11 +253,11 @@ msgstr "Paylaşılmayan"
#: js/share.js:308
msgid "can edit"
-msgstr ""
+msgstr "düzenleyebilir"
#: js/share.js:310
msgid "access control"
-msgstr ""
+msgstr "erişim kontrolü"
#: js/share.js:313
msgid "create"
@@ -265,35 +265,35 @@ msgstr "oluştur"
#: js/share.js:316
msgid "update"
-msgstr ""
+msgstr "güncelle"
#: js/share.js:319
msgid "delete"
-msgstr ""
+msgstr "sil"
#: js/share.js:322
msgid "share"
-msgstr ""
+msgstr "paylaş"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
-msgstr ""
+msgstr "Paralo korumalı"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "Gönderiliyor..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "Eposta gönderildi"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -309,14 +309,14 @@ msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilec
#: lostpassword/templates/lostpassword.php:5
msgid "Reset email send."
-msgstr ""
+msgstr "Sıfırlama epostası gönderildi."
#: lostpassword/templates/lostpassword.php:8
msgid "Request failed!"
-msgstr ""
+msgstr "İstek reddedildi!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "Kullanıcı adı"
@@ -405,44 +405,44 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Gelişmiş"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Veri klasörü"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Veritabanını ayarla"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "kullanılacak"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Veritabanı kullanıcı adı"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Veritabanı parolası"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Veritabanı adı"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Veritabanı tablo alanı"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Veritabanı sunucusu"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Kurulumu tamamla"
@@ -530,29 +530,29 @@ msgstr "kontrolünüzdeki web servisleri"
msgid "Log out"
msgstr "Çıkış yap"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Otomatik oturum açma reddedildi!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr ""
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "Parolanızı mı unuttunuz?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "hatırla"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "Giriş yap"
@@ -570,7 +570,7 @@ msgstr "sonraki"
#: templates/verify.php:5
msgid "Security Warning!"
-msgstr ""
+msgstr "Güvenlik Uyarısı!"
#: templates/verify.php:6
msgid ""
@@ -580,4 +580,4 @@ msgstr ""
#: templates/verify.php:16
msgid "Verify"
-msgstr ""
+msgstr "Doğrula"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index fbd322633df..bfd4390738c 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 11:50+0000\n"
-"Last-Translator: alpere <info@beyboo.de>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 11:23+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr "Bir hata yok, dosya başarıyla yüklendi"
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı."
#: ajax/upload.php:23
msgid ""
@@ -57,11 +57,11 @@ msgstr "Diske yazılamadı"
msgid "Files"
msgstr "Dosyalar"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Sil"
@@ -69,39 +69,39 @@ msgstr "Sil"
msgid "Rename"
msgstr "İsim değiştir."
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
msgstr "{new_name} zaten mevcut"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
msgstr "değiştir"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
msgstr "Öneri ad"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
msgstr "iptal"
-#: js/filelist.js:250
+#: js/filelist.js:248
msgid "replaced {new_name}"
msgstr "değiştirilen {new_name}"
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
msgid "undo"
msgstr "geri al"
-#: js/filelist.js:252
+#: js/filelist.js:250
msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "{new_name} ismi {old_name} ile değiştirildi"
-#: js/filelist.js:284
+#: js/filelist.js:282
msgid "unshared {files}"
msgstr "paylaşılmamış {files}"
-#: js/filelist.js:286
+#: js/filelist.js:284
msgid "deleted {files}"
msgstr "silinen {files}"
@@ -109,84 +109,84 @@ msgstr "silinen {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
-#: js/files.js:218
+#: js/files.js:212
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
-#: js/files.js:218
+#: js/files.js:212
msgid "Upload Error"
msgstr "Yükleme hatası"
-#: js/files.js:235
+#: js/files.js:229
msgid "Close"
msgstr "Kapat"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:248 js/files.js:362 js/files.js:392
msgid "Pending"
msgstr "Bekliyor"
-#: js/files.js:274
+#: js/files.js:268
msgid "1 file uploading"
msgstr "1 dosya yüklendi"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:271 js/files.js:325 js/files.js:340
msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} dosya yükleniyor"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:343 js/files.js:376
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/files.js:451
+#: js/files.js:445
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
-#: js/files.js:523
+#: js/files.js:515
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Geçersiz dizin ismi. \"Shared\" dizini OwnCloud tarafından kullanılmaktadır."
-#: js/files.js:704
+#: js/files.js:699
msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} dosya tarandı"
-#: js/files.js:712
+#: js/files.js:707
msgid "error while scanning"
msgstr "tararamada hata oluşdu"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:780 templates/index.php:66
msgid "Name"
msgstr "Ad"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:781 templates/index.php:77
msgid "Size"
msgstr "Boyut"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:782 templates/index.php:79
msgid "Modified"
msgstr "Değiştirilme"
-#: js/files.js:814
+#: js/files.js:801
msgid "1 folder"
-msgstr ""
+msgstr "1 dizin"
-#: js/files.js:816
+#: js/files.js:803
msgid "{count} folders"
-msgstr ""
+msgstr "{count} dizin"
-#: js/files.js:824
+#: js/files.js:811
msgid "1 file"
-msgstr ""
+msgstr "1 dosya"
-#: js/files.js:826
+#: js/files.js:813
msgid "{count} files"
-msgstr ""
+msgstr "{count} dosya"
#: templates/admin.php:5
msgid "File handling"
@@ -234,7 +234,7 @@ msgstr "Klasör"
#: templates/index.php:14
msgid "From link"
-msgstr ""
+msgstr "Bağlantıdan"
#: templates/index.php:35
msgid "Upload"
@@ -244,28 +244,28 @@ msgstr "Yükle"
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "İndir"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Yüklemeniz çok büyük"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Dosyalar taranıyor, lütfen bekleyin."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "Güncel tarama"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index af47564a459..c48e3908ae6 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 10:35+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Şifreleme"
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
-msgstr ""
+#: templates/settings.php:6
+msgid "Enable Encryption"
+msgstr "Şifrelemeyi Etkinleştir"
-#: templates/settings.php:5
+#: templates/settings.php:7
msgid "None"
-msgstr ""
+msgstr "Hiçbiri"
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr ""
+#: templates/settings.php:12
+msgid "Exclude the following file types from encryption"
+msgstr "Aşağıdaki dosya tiplerini şifrelemeye dahil etme"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index b9f7d56aeb9..bb6c928a053 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 13:50+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -56,39 +57,39 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Harici Depolama"
#: templates/settings.php:8 templates/settings.php:22
msgid "Mount point"
-msgstr ""
+msgstr "Bağlama Noktası"
#: templates/settings.php:9
msgid "Backend"
-msgstr ""
+msgstr "Yönetici"
#: templates/settings.php:10
msgid "Configuration"
-msgstr ""
+msgstr "Yapılandırma"
#: templates/settings.php:11
msgid "Options"
-msgstr ""
+msgstr "Seçenekler"
#: templates/settings.php:12
msgid "Applicable"
-msgstr ""
+msgstr "Uygulanabilir"
#: templates/settings.php:27
msgid "Add mount point"
-msgstr ""
+msgstr "Bağlama noktası ekle"
#: templates/settings.php:85
msgid "None set"
-msgstr ""
+msgstr "Hiçbiri"
#: templates/settings.php:86
msgid "All Users"
-msgstr ""
+msgstr "Tüm Kullanıcılar"
#: templates/settings.php:87
msgid "Groups"
@@ -99,7 +100,7 @@ msgid "Users"
msgstr "Kullanıcılar"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Sil"
@@ -111,10 +112,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL kök sertifikaları"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Kök Sertifikalarını İçe Aktar"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index d9aaae9d168..1d3dff15348 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 09:24+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +18,26 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/settings-personal.js:31 templates/settings-personal.php:10
+#: js/settings-personal.js:31 templates/settings-personal.php:7
msgid "Expire all versions"
-msgstr ""
+msgstr "Tüm sürümleri sona erdir"
#: js/versions.js:16
msgid "History"
-msgstr ""
+msgstr "Geçmiş"
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Sürümler"
-#: templates/settings-personal.php:7
+#: templates/settings-personal.php:10
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Bu dosyalarınızın tüm yedek sürümlerini silecektir"
#: templates/settings.php:3
msgid "Files Versioning"
-msgstr ""
+msgstr "Dosya Sürümleri"
#: templates/settings.php:4
msgid "Enable"
-msgstr ""
+msgstr "Etkinleştir"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 6489d33ae28..66590bc8eb0 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 11:03+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,49 +18,49 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:285
+#: app.php:287
msgid "Help"
msgstr "Yardı"
-#: app.php:292
+#: app.php:294
msgid "Personal"
msgstr "Kişisel"
-#: app.php:297
+#: app.php:299
msgid "Settings"
msgstr "Ayarlar"
-#: app.php:302
+#: app.php:304
msgid "Users"
msgstr "Kullanıcılar"
-#: app.php:309
+#: app.php:311
msgid "Apps"
-msgstr ""
+msgstr "Uygulamalar"
-#: app.php:311
+#: app.php:313
msgid "Admin"
-msgstr ""
+msgstr "Yönetici"
-#: files.php:332
+#: files.php:365
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP indirmeleri kapatılmıştır."
-#: files.php:333
+#: files.php:366
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
msgid "Back to Files"
-msgstr ""
+msgstr "Dosyalara dön"
-#: files.php:357
+#: files.php:390
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Uygulama etkinleştirilmedi"
#: json.php:39 json.php:64 json.php:77 json.php:89
msgid "Authentication error"
@@ -67,7 +68,7 @@ msgstr "Kimlik doğrulama hatası"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Jetonun süresi geçti. Lütfen sayfayı yenileyin."
#: search/provider/file.php:17 search/provider/file.php:35
msgid "Files"
@@ -79,74 +80,74 @@ msgstr "Metin"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "Resimler"
#: template.php:103
msgid "seconds ago"
-msgstr ""
+msgstr "saniye önce"
#: template.php:104
msgid "1 minute ago"
-msgstr ""
+msgstr "1 dakika önce"
#: template.php:105
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d dakika önce"
#: template.php:106
msgid "1 hour ago"
-msgstr ""
+msgstr "1 saat önce"
#: template.php:107
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "%d saat önce"
#: template.php:108
msgid "today"
-msgstr ""
+msgstr "bugün"
#: template.php:109
msgid "yesterday"
-msgstr ""
+msgstr "dün"
#: template.php:110
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d gün önce"
#: template.php:111
msgid "last month"
-msgstr ""
+msgstr "geçen ay"
#: template.php:112
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "%d ay önce"
#: template.php:113
msgid "last year"
-msgstr ""
+msgstr "geçen yıl"
#: template.php:114
msgid "years ago"
-msgstr ""
+msgstr "yıl önce"
#: updater.php:75
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s kullanılabilir durumda. <a href=\"%s\">Daha fazla bilgi</a> alın"
#: updater.php:77
msgid "up to date"
-msgstr ""
+msgstr "güncel"
#: updater.php:80
msgid "updates check is disabled"
-msgstr ""
+msgstr "güncelleme kontrolü kapalı"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "\"%s\" kategorisi bulunamadı"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 2842d1b2d17..424615dce38 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 11:41+0000\n"
-"Last-Translator: alpere <info@beyboo.de>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 11:45+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -119,29 +119,29 @@ msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Dökümantasyon"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Kullanıcı Belgelendirmesi"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Büyük Dosyaların Yönetimi"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Yönetici Belgelendirmesi"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Bir soru sorun"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Çevrimiçi Belgelendirme"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Yardım veritabanına bağlanmada sorunlar var."
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Forum"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Oraya elle gidin."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "Hata Takip Sistemi"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Cevap"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Ticari Destek"
#: templates/personal.php:8
#, php-format
@@ -149,62 +149,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Masaüstü ve Mobil Senkron İstemcileri"
+msgid "Clients"
+msgstr "Müşteriler"
#: templates/personal.php:13
-msgid "Download"
-msgstr "İndir"
+msgid "Download Desktop Clients"
+msgstr "Masaüstü İstemcilerini İndir"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Android İstemcisini İndir"
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "iOS İstemcisini İndir"
-#: templates/personal.php:19
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Parola"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Şifreniz değiştirildi"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Parolanız değiştirilemiyor"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Mevcut parola"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Yeni parola"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "göster"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Parola değiştir"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Eposta"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Eposta adresiniz"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Parola sıfırlamayı aktifleştirmek için eposta adresi girin"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Dil"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Çevirilere yardım edin"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanın"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Sürüm"
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,10 +238,6 @@ msgstr "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_bla
msgid "Name"
msgstr "Ad"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Parola"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Gruplar"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 5429c2cff89..66d4941f8de 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,168 +3,182 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-29 00:07+0100\n"
+"PO-Revision-Date: 2012-12-28 09:39+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
-msgid "Host"
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
+msgid "Host"
+msgstr "Konak"
+
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
-msgstr ""
+msgstr "User DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
-msgstr ""
+msgstr "Parola"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
-msgstr ""
+msgstr "Kullanıcı Oturum Açma Süzgeci"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
-msgstr ""
+msgstr "Kullanıcı Liste Süzgeci"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
-msgstr ""
+msgstr "Grup Süzgeci"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
-msgstr ""
+msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
-msgstr ""
+msgstr "Temel Kullanıcı Ağacı"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
-msgstr ""
+msgstr "Temel Grup Ağacı"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
-msgstr ""
+msgstr "Grup-Üye işbirliği"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
-msgstr ""
+msgstr "TLS kullan"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "SSL bağlantıları ile kullanmayın, başarısız olacaktır."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "SSL sertifika doğrulamasını kapat."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Önerilmez, sadece test için kullanın."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
-msgstr ""
+msgstr "byte cinsinden"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
-msgstr ""
+msgstr "Yardım"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index 55bcf674de0..ca1186efbec 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# <info@beyboo.de>, 2012.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 11:44+0000\n"
-"Last-Translator: alpere <info@beyboo.de>\n"
+"POT-Creation-Date: 2012-12-28 00:20+0100\n"
+"PO-Revision-Date: 2012-12-27 09:06+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index a169a56596c..613086e2095 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -5,12 +5,13 @@
# Translators:
# <dzubchikd@gmail.com>, 2012.
# <skoptev@ukr.net>, 2012.
+# <volodya327@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 02:04+0000\n"
"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +118,29 @@ msgstr "Перегляньте сторінку програм на apps.ownclou
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Документація"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "Документація Користувача"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Управління великими файлами"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "Документація Адміністратора"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Запитати"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "Он-Лайн Документація"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Проблема при з'єднані з базою допомоги"
+#: templates/help.php:7
+msgid "Forum"
+msgstr "Форум"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Перейти вручну."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "БагТрекер"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Відповідь"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "Комерційна підтримка"
#: templates/personal.php:8
#, php-format
@@ -147,62 +148,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Настільні та мобільні клієнти синхронізації"
+msgid "Clients"
+msgstr "Клієнти"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Завантажити"
+msgid "Download Desktop Clients"
+msgstr "Завантажити клієнт для ПК"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "Завантажити клієнт для Android"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "Завантажити клієнт для iOS"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Пароль"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Ваш пароль змінено"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Не вдалося змінити Ваш пароль"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Поточний пароль"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Новий пароль"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "показати"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Змінити пароль"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Ел.пошта"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Ваша адреса електронної пошти"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Введіть адресу електронної пошти для відновлення паролю"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Мова"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Допомогти з перекладом"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "використовувати цю адресу для з'єднання з ownCloud у Вашому файловому менеджері"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "Версія"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +237,6 @@ msgstr "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_b
msgid "Name"
msgstr "Ім'я"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Пароль"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Групи"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index dd12c4f2b25..b6601497ecb 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -4,12 +4,13 @@
#
# Translators:
# <victor.dubiniuk@gmail.com>, 2012.
+# <volodya327@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 12:54+0000\n"
+"POT-Creation-Date: 2012-12-19 00:03+0100\n"
+"PO-Revision-Date: 2012-12-18 12:52+0000\n"
"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -19,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них."
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його."
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Хост"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Базовий DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Користувача"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Фільтр Користувачів, що під'єднуються"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Фільтр Списку Користувачів"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Фільтр Груп"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Визначає фільтр, який застосовується при отриманні груп."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Основне Дерево Користувачів"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Основне Дерево Груп"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Асоціація Група-Член"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Використовуйте TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Не використовуйте його для SSL з'єднань, це не буде виконано."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечутливий до регістру LDAP сервер (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Вимкнути перевірку SSL сертифіката."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Не рекомендується, використовуйте лише для тестів."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Поле, яке відображає Ім'я Користувача"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Поле, яке відображає Ім'я Групи"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Зміна очищує кеш."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Допомога"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index e9b0d979026..d81333a1909 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# <skoptev@ukr.net>, 2012.
+# <volodya327@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 14:48+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-12-23 00:09+0100\n"
+"PO-Revision-Date: 2012-12-22 01:58+0000\n"
+"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr "ownCloud відправить облікові дані на цей URL та буде інтерпретувати http 401 і http 403, як невірні облікові дані, а всі інші коди, як вірні."
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 63bd843d709..e17d6607eed 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: mattheu_9x <mattheu.9x@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -121,29 +121,29 @@ msgstr "Xem nhiều ứng dụng hơn tại apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-Giấy phép được cấp bởi <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Tài liệu"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Quản lý tập tin lớn"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Đặt câu hỏi"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Vấn đề kết nối đến cơ sở dữ liệu."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Đến bằng thủ công."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "trả lời"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -151,62 +151,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Đồng bộ dữ liệu"
+msgid "Clients"
+msgstr "Khách hàng"
#: templates/personal.php:13
-msgid "Download"
-msgstr "Tải về"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "Mật khẩu"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "Mật khẩu của bạn đã được thay đổi."
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "Không thể đổi mật khẩu"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "Mật khẩu cũ"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "Mật khẩu mới "
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "Hiện"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "Đổi mật khẩu"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "Email của bạn"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "Ngôn ngữ"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "Hỗ trợ dịch thuật"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin "
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -220,10 +240,6 @@ msgstr "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" tar
msgid "Name"
msgstr "Tên"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Mật khẩu"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "Nhóm"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 7f60127a8f9..c6157201e51 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 14:01+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Máy chủ"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN cơ bản"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Người dùng DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Mật khẩu"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Lọc người dùng đăng nhập"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lọc danh sách thành viên"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Bộ lọc nhóm"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Cổng"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Cây người dùng cơ bản"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Cây nhóm cơ bản"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Nhóm thành viên Cộng đồng"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Sử dụng TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Kết nối SSL bị lỗi. "
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Tắt xác thực chứng nhận SSL"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL trong máy chủ ownCloud của bạn."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Hiển thị tên người sử dụng"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Hiển thị tên nhóm"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "Theo Byte"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Giúp đỡ"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index b747056a5ca..5faffd6c9af 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 12:35+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 8dee70c1dde..345bc3af512 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -117,29 +117,29 @@ msgstr "在owncloud.com上查看应用程序"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "文档"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "管理大文件"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "提一个问题"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "连接到帮助数据库时的问题"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "收到转到."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "回答"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -147,62 +147,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "桌面和移动同步客户端"
+msgid "Clients"
+msgstr "客户"
#: templates/personal.php:13
-msgid "Download"
-msgstr "下载"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "密码"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "您的密码以变更"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "不能改变你的密码"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "现在的密码"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "新密码"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "展示"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "改变密码"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "Email"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "你的email地址"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "输入一个邮箱地址以激活密码恢复功能"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "语言"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "使用这个地址和你的文件管理器连接到你的ownCloud"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,10 +236,6 @@ msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud
msgid "Name"
msgstr "名字"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "密码"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "组"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 119c7188675..75ea9d9c0e9 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-18 02:01+0200\n"
-"PO-Revision-Date: 2012-09-17 12:39+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "主机"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "您可以忽略协议,除非您需要 SSL。然后用 ldaps:// 开头"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "基本判别名"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "用户判别名"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "客户机用户的判别名,将用于绑定,例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "密码"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿名访问请留空判别名和密码。"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "用户登录过滤器"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid 占位符,例如 \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "用户列表过滤器"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义撷取用户时要应用的过滤器。"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "不能使用占位符,例如 \"objectClass=person\"。"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "群组过滤器"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义撷取群组时要应用的过滤器"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "不能使用占位符,例如 \"objectClass=posixGroup\"。"
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "端口"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "基本用户树"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "基本群组树"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "群组-成员组合"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "使用 TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "不要使用它进行 SSL 连接,会失败的。"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "关闭 SSL 证书校验。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "如果只有使用此选项才能连接,请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "不推荐,仅供测试"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "群组显示名称字段"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "以字节计"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改会清空缓存。"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 43a080af885..4c2e6b80abe 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 118d37c13f9..2742708ecc6 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -4,6 +4,7 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
# Phoenix Nemo <>, 2012.
# <suiy02@gmail.com>, 2012.
# <wengxt@gmail.com>, 2011, 2012.
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 14:31+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +25,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "用户 %s 与您共享了一个文件"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "用户 %s 与您共享了一个文件夹"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "用户 %s 与您共享了文件\"%s\"。文件下载地址:%s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址:%s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -165,8 +166,8 @@ msgid "The object type is not specified."
msgstr "未指定对象类型。"
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
msgid "Error"
msgstr "错误"
@@ -178,7 +179,7 @@ msgstr "未指定App名称。"
msgid "The required file {file} is not installed!"
msgstr "所需文件{file}未安装!"
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
msgid "Error while sharing"
msgstr "共享时出错"
@@ -206,11 +207,11 @@ msgstr "共享"
msgid "Share with link"
msgstr "共享链接"
-#: js/share.js:164
+#: js/share.js:166
msgid "Password protect"
msgstr "密码保护"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
#: templates/verify.php:13
msgid "Password"
msgstr "密码"
@@ -221,7 +222,7 @@ msgstr ""
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "发送"
#: js/share.js:177
msgid "Set expiration date"
@@ -275,25 +276,25 @@ msgstr "删除"
msgid "share"
msgstr "共享"
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:541
+#: js/share.js:554
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:553
+#: js/share.js:566
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:568
+#: js/share.js:581
msgid "Sending ..."
-msgstr ""
+msgstr "正在发送..."
-#: js/share.js:579
+#: js/share.js:592
msgid "Email sent"
-msgstr ""
+msgstr "邮件已发送"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -315,8 +316,8 @@ msgstr "重置邮件已发送。"
msgid "Request failed!"
msgstr "请求失败!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:28
msgid "Username"
msgstr "用户名"
@@ -405,44 +406,44 @@ msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.
msgid "Create an <strong>admin account</strong>"
msgstr "创建<strong>管理员账号</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "高级"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "数据目录"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "配置数据库"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "将被使用"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "数据库用户"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "数据库密码"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "数据库名"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "数据库表空间"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "数据库主机"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "安装完成"
@@ -530,29 +531,29 @@ msgstr "由您掌控的网络服务"
msgid "Log out"
msgstr "注销"
-#: templates/login.php:8
+#: templates/login.php:10
msgid "Automatic logon rejected!"
msgstr "自动登录被拒绝!"
-#: templates/login.php:9
+#: templates/login.php:11
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
msgstr "如果您没有最近修改您的密码,您的帐户可能会受到影响!"
-#: templates/login.php:10
+#: templates/login.php:13
msgid "Please change your password to secure your account again."
msgstr "请修改您的密码,以保护您的账户安全。"
-#: templates/login.php:15
+#: templates/login.php:19
msgid "Lost your password?"
msgstr "忘记密码?"
-#: templates/login.php:27
+#: templates/login.php:39
msgid "remember"
msgstr "记住"
-#: templates/login.php:28
+#: templates/login.php:41
msgid "Log in"
msgstr "登录"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index fda4fc50739..674ecf16c69 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -4,13 +4,14 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 14:40+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "配置Google Drive存储时出错"
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>警告:</b>“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。"
#: lib/config.php:435
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>警告:</b>PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。"
#: templates/settings.php:3
msgid "External Storage"
@@ -100,7 +101,7 @@ msgid "Users"
msgstr "用户"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "删除"
@@ -112,10 +113,10 @@ msgstr "启用用户外部存储"
msgid "Allow users to mount their own external storage"
msgstr "允许用户挂载自有外部存储"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL根证书"
-#: templates/settings.php:158
+#: templates/settings.php:153
msgid "Import Root Certificate"
msgstr "导入根证书"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index bd122830a29..2e39772a758 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -4,6 +4,7 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
# Phoenix Nemo <>, 2012.
# <rainofchaos@gmail.com>, 2012.
# <suiy02@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-04 00:06+0100\n"
-"PO-Revision-Date: 2012-12-03 00:58+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-24 00:11+0100\n"
+"PO-Revision-Date: 2012-12-23 13:54+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -120,29 +121,29 @@ msgstr "查看在 app.owncloud.com 的应用程序页面"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "文档"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr "用户文档"
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "管理大文件"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr "管理员文档"
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "提问"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr "在线文档"
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "连接帮助数据库错误 "
+#: templates/help.php:7
+msgid "Forum"
+msgstr "论坛"
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "手动访问"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr "问题跟踪器"
-#: templates/help.php:31
-msgid "Answer"
-msgstr "回答"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr "商业支持"
#: templates/personal.php:8
#, php-format
@@ -150,62 +151,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "你已使用 <strong>%s</strong>,有效空间 <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "桌面和移动设备同步客户端"
+msgid "Clients"
+msgstr "客户"
#: templates/personal.php:13
-msgid "Download"
-msgstr "下载"
+msgid "Download Desktop Clients"
+msgstr "下载桌面客户端"
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr "下载 Android 客户端"
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr "下载 iOS 客户端"
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "密码"
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "密码已修改"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "无法修改密码"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "当前密码"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "新密码"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "显示"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "修改密码"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "电子邮件"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "您的电子邮件"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "填写电子邮件地址以启用密码恢复功能"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "语言"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "您可在文件管理器中使用该地址连接到ownCloud"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr "WebDAV"
-#: templates/personal.php:61
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr "用该地址来连接文件管理器中的 ownCloud"
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr "版本"
+
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,10 +240,6 @@ msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社
msgid "Name"
msgstr "名称"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "密码"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "组"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 00e887720fd..be239585259 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 05:22+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "主机"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "可以忽略协议,但如要使用SSL,则需以ldaps://开头"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡里为用户和组指定Base DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr "客户端使用的DN必须与绑定的相同,比如uid=agent,dc=example,dc=com\n如需匿名访问,将DN和密码保留为空"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "密码"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "启用匿名访问,将DN和密码保留为空"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "用户登录过滤"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "定义当尝试登录时的过滤器。 在登录过程中,%%uid将会被用户名替换"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid作为占位符,例如“uid=%%uid”"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "用户列表过滤"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义拉取用户时的过滤器"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "没有任何占位符,如 \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "组过滤"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义拉取组信息时的过滤器"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "无需占位符,例如\"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "端口"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "基础用户树"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "基础组树"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "组成员关联"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "不要在SSL链接中使用此选项,会导致失败。"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写敏感LDAP服务器(Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "关闭SSL证书验证"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "如果链接仅在此选项时可用,在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "暂不推荐,仅供测试"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用来生成用户的ownCloud名称的 LDAP属性"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "组显示名称字段"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用来生成组的ownCloud名称的LDAP属性"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "字节数"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index cdb6da1b8e1..fc3ccc1393b 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 11:47+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-24 00:10+0100\n"
+"PO-Revision-Date: 2012-12-23 13:55+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV地址: http://"
+msgid "URL: http://"
+msgstr "URL:http://"
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index df89b1aac2e..5b1f23f900f 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index b59ebba9006..24846079f01 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index ef8741a0c1e..c1f1ee6edb2 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index cc8fc8f62b2..ca897a2325b 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-21 00:10+0100\n"
+"PO-Revision-Date: 2012-12-19 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -121,29 +121,29 @@ msgstr "查看應用程式頁面於 apps.owncloud.com"
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "文件"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "管理大檔案"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "提問"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "連接到求助資料庫時發生問題"
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "手動前往"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
-#: templates/help.php:31
-msgid "Answer"
-msgstr "答案"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
#: templates/personal.php:8
#, php-format
@@ -151,62 +151,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "您已經使用了 <strong>%s</strong> ,目前可用空間為 <strong>%s</strong>"
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "桌機與手機同步客戶端"
+msgid "Clients"
+msgstr "客戶"
#: templates/personal.php:13
-msgid "Download"
-msgstr "下載"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "密碼"
-#: templates/personal.php:19
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr "你的密碼已更改"
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr "無法變更你的密碼"
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr "目前密碼"
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr "新密碼"
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr "顯示"
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr "變更密碼"
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr "電子郵件"
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr "你的電子郵件信箱"
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr "請填入電子郵件信箱以便回復密碼"
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr "語言"
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr "幫助翻譯"
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "使用這個位址去連接到你的私有雲檔案管理員"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -220,10 +240,6 @@ msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud
msgid "Name"
msgstr "名稱"
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "密碼"
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr "群組"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index ca4a4be144c..2bf0669ac23 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 14:32+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "密碼"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "關閉 SSL 憑證驗證"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "說明"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 5a191f76b2b..0870470a5c2 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-26 09:00+0000\n"
-"Last-Translator: sofiasu <sofia168@livemail.tw>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,5 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
-msgstr "WebDAV 網址 http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
+msgstr ""
diff --git a/l10n/zu_ZA/settings.po b/l10n/zu_ZA/settings.po
index 34b89c89036..d59859009b5 100644
--- a/l10n/zu_ZA/settings.po
+++ b/l10n/zu_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:11+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -115,28 +115,28 @@ msgstr ""
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
msgstr ""
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
@@ -145,62 +145,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
msgstr ""
#: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:23
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:24
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:25
msgid "New password"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:26
msgid "show"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:27
msgid "Change password"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:33
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:34
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:35
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:47
msgid "Help translate"
msgstr ""
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
msgstr ""
-#: templates/personal.php:61
+#: templates/personal.php:65
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -214,10 +234,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
msgstr ""
diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po
index a4f2985ab0e..3add8a2631e 100644
--- a/l10n/zu_ZA/user_ldap.po
+++ b/l10n/zu_ZA/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-06 00:00+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/zu_ZA/user_webdavauth.po b/l10n/zu_ZA/user_webdavauth.po
index d6cfcb1f9a6..3a53e0a85e8 100644
--- a/l10n/zu_ZA/user_webdavauth.po
+++ b/l10n/zu_ZA/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-20 00:11+0100\n"
+"PO-Revision-Date: 2012-12-19 23:12+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,5 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials "
+"correct."
msgstr ""
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index fa4c91c1269..9839dafbce1 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -98,8 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
if ($this->connection) {
$native_code = $this->connection->lastErrorCode();
}
- $native_msg = $this->_lasterror
- ? html_entity_decode($this->_lasterror) : $this->connection->lastErrorMsg();
+ $native_msg = html_entity_decode($this->_lasterror);
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
// this hack to work around it, per bug #9599.
diff --git a/lib/app.php b/lib/app.php
index 5d4fbbd9c23..be6d5ab3dd3 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -597,16 +597,16 @@ class OC_App{
$app1[$i]['internal'] = $app1[$i]['active'] = 0;
// rating img
- if($app['score']>=0 and $app['score']<5) $img=OC_Helper::imagePath( "core", "rating/s1.png" );
- elseif($app['score']>=5 and $app['score']<15) $img=OC_Helper::imagePath( "core", "rating/s2.png" );
- elseif($app['score']>=15 and $app['score']<25) $img=OC_Helper::imagePath( "core", "rating/s3.png" );
- elseif($app['score']>=25 and $app['score']<35) $img=OC_Helper::imagePath( "core", "rating/s4.png" );
- elseif($app['score']>=35 and $app['score']<45) $img=OC_Helper::imagePath( "core", "rating/s5.png" );
- elseif($app['score']>=45 and $app['score']<55) $img=OC_Helper::imagePath( "core", "rating/s6.png" );
- elseif($app['score']>=55 and $app['score']<65) $img=OC_Helper::imagePath( "core", "rating/s7.png" );
- elseif($app['score']>=65 and $app['score']<75) $img=OC_Helper::imagePath( "core", "rating/s8.png" );
- elseif($app['score']>=75 and $app['score']<85) $img=OC_Helper::imagePath( "core", "rating/s9.png" );
- elseif($app['score']>=85 and $app['score']<95) $img=OC_Helper::imagePath( "core", "rating/s10.png" );
+ if($app['score']>=0 and $app['score']<5) $img=OC_Helper::imagePath( "core", "rating/s1.png" );
+ elseif($app['score']>=5 and $app['score']<15) $img=OC_Helper::imagePath( "core", "rating/s2.png" );
+ elseif($app['score']>=15 and $app['score']<25) $img=OC_Helper::imagePath( "core", "rating/s3.png" );
+ elseif($app['score']>=25 and $app['score']<35) $img=OC_Helper::imagePath( "core", "rating/s4.png" );
+ elseif($app['score']>=35 and $app['score']<45) $img=OC_Helper::imagePath( "core", "rating/s5.png" );
+ elseif($app['score']>=45 and $app['score']<55) $img=OC_Helper::imagePath( "core", "rating/s6.png" );
+ elseif($app['score']>=55 and $app['score']<65) $img=OC_Helper::imagePath( "core", "rating/s7.png" );
+ elseif($app['score']>=65 and $app['score']<75) $img=OC_Helper::imagePath( "core", "rating/s8.png" );
+ elseif($app['score']>=75 and $app['score']<85) $img=OC_Helper::imagePath( "core", "rating/s9.png" );
+ elseif($app['score']>=85 and $app['score']<95) $img=OC_Helper::imagePath( "core", "rating/s10.png" );
elseif($app['score']>=95 and $app['score']<100) $img=OC_Helper::imagePath( "core", "rating/s11.png" );
$app1[$i]['score'] = '<img src="'.$img.'"> Score: '.$app['score'].'%';
diff --git a/lib/base.php b/lib/base.php
index 0b75f6f085e..94fb7979620 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -27,704 +27,731 @@ require_once 'public/constants.php';
* No, we can not put this class in its own file because it is used by
* OC_autoload!
*/
-class OC{
- /**
- * Assoziative array for autoloading. classname => filename
- */
- public static $CLASSPATH = array();
- /**
- * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
- */
- public static $SERVERROOT = '';
- /**
- * the current request path relative to the owncloud root (e.g. files/index.php)
- */
- private static $SUBURI = '';
- /**
- * the owncloud root path for http requests (e.g. owncloud/)
- */
- public static $WEBROOT = '';
- /**
- * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
- */
- public static $THIRDPARTYROOT = '';
- /**
- * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
- */
- public static $THIRDPARTYWEBROOT = '';
- /**
- * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
- * web path in 'url'
- */
- public static $APPSROOTS = array();
- /*
- * requested app
- */
- public static $REQUESTEDAPP = '';
- /*
- * requested file of app
- */
- public static $REQUESTEDFILE = '';
- /**
- * check if owncloud runs in cli mode
- */
- public static $CLI = false;
- /*
- * OC router
- */
- protected static $router = null;
- /**
- * SPL autoload
- */
- public static function autoload($className) {
- if(array_key_exists($className, OC::$CLASSPATH)) {
- $path = OC::$CLASSPATH[$className];
- /** @TODO: Remove this when necessary
- Remove "apps/" from inclusion path for smooth migration to mutli app dir
- */
- if (strpos($path, 'apps/')===0) {
- OC_Log::write('core', 'include path for class "'.$className.'" starts with "apps/"', OC_Log::DEBUG);
- $path = str_replace('apps/', '', $path);
- }
- }
- elseif(strpos($className, 'OC_')===0) {
- $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
- }
- elseif(strpos($className, 'OC\\')===0) {
- $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
- }
- elseif(strpos($className, 'OCP\\')===0) {
- $path = 'public/'.strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
- }
- elseif(strpos($className, 'OCA\\')===0) {
- $path = 'apps/'.strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
- }
- elseif(strpos($className, 'Sabre_')===0) {
- $path = str_replace('_', '/', $className) . '.php';
- }
- elseif(strpos($className, 'Symfony\\Component\\Routing\\')===0) {
- $path = 'symfony/routing/'.str_replace('\\', '/', $className) . '.php';
- }
- elseif(strpos($className, 'Sabre\\VObject')===0) {
- $path = str_replace('\\', '/', $className) . '.php';
- }
- elseif(strpos($className, 'Test_')===0) {
- $path = 'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
- }else{
- return false;
- }
-
- if($fullPath = stream_resolve_include_path($path)) {
- require_once $fullPath;
- }
- return false;
- }
-
- public static function initPaths() {
- // calculate the root directories
- OC::$SERVERROOT=str_replace("\\", '/', substr(__DIR__, 0, -4));
- OC::$SUBURI= str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
- $scriptName=$_SERVER["SCRIPT_NAME"];
- if(substr($scriptName, -1)=='/') {
- $scriptName.='index.php';
- //make sure suburi follows the same rules as scriptName
- if(substr(OC::$SUBURI, -9)!='index.php') {
- if(substr(OC::$SUBURI, -1)!='/') {
- OC::$SUBURI=OC::$SUBURI.'/';
- }
- OC::$SUBURI=OC::$SUBURI.'index.php';
- }
- }
-
- OC::$WEBROOT=substr($scriptName, 0, strlen($scriptName)-strlen(OC::$SUBURI));
-
- if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/') {
- OC::$WEBROOT='/'.OC::$WEBROOT;
- }
-
- // ensure we can find OC_Config
- set_include_path(
- OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.
- get_include_path()
- );
-
- // search the 3rdparty folder
- if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>'') {
- OC::$THIRDPARTYROOT=OC_Config::getValue('3rdpartyroot', '');
- OC::$THIRDPARTYWEBROOT=OC_Config::getValue('3rdpartyurl', '');
- }elseif(file_exists(OC::$SERVERROOT.'/3rdparty')) {
- OC::$THIRDPARTYROOT=OC::$SERVERROOT;
- OC::$THIRDPARTYWEBROOT=OC::$WEBROOT;
- }elseif(file_exists(OC::$SERVERROOT.'/../3rdparty')) {
- OC::$THIRDPARTYWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
- OC::$THIRDPARTYROOT=rtrim(dirname(OC::$SERVERROOT), '/');
- }else{
- echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
- exit;
- }
- // search the apps folder
- $config_paths = OC_Config::getValue('apps_paths', array());
- if(! empty($config_paths)) {
- foreach($config_paths as $paths) {
- if( isset($paths['url']) && isset($paths['path'])) {
- $paths['url'] = rtrim($paths['url'], '/');
- $paths['path'] = rtrim($paths['path'], '/');
- OC::$APPSROOTS[] = $paths;
- }
- }
- }elseif(file_exists(OC::$SERVERROOT.'/apps')) {
- OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => true);
- }elseif(file_exists(OC::$SERVERROOT.'/../apps')) {
- OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps', 'writable' => true);
- }
-
- if(empty(OC::$APPSROOTS)) {
- echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
- exit;
- }
- $paths = array();
- foreach( OC::$APPSROOTS as $path)
- $paths[] = $path['path'];
-
- // set the right include path
- set_include_path(
- OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.
- OC::$SERVERROOT.'/config'.PATH_SEPARATOR.
- OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.
- implode($paths, PATH_SEPARATOR).PATH_SEPARATOR.
- get_include_path().PATH_SEPARATOR.
- OC::$SERVERROOT
- );
- }
-
- public static function checkInstalled() {
- // Redirect to installer if not installed
- if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
- if(!OC::$CLI) {
- $url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
- header("Location: $url");
- }
- exit();
- }
- }
-
- public static function checkSSL() {
- // redirect to https site if configured
- if( OC_Config::getValue( "forcessl", false )) {
- header('Strict-Transport-Security: max-age=31536000');
- ini_set("session.cookie_secure", "on");
- if(OC_Request::serverProtocol()<>'https' and !OC::$CLI) {
- $url = "https://". OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
- header("Location: $url");
- exit();
- }
- }
- }
-
- public static function checkUpgrade() {
- if(OC_Config::getValue('installed', false)) {
- $installedVersion=OC_Config::getValue('version', '0.0.0');
- $currentVersion=implode('.', OC_Util::getVersion());
- if (version_compare($currentVersion, $installedVersion, '>')) {
- // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions
- if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
- if(!OC_Util::ishtaccessworking()) {
- if(!file_exists(OC::$SERVERROOT.'/data/.htaccess')) {
- OC_Setup::protectDataDirectory();
- }
- }
- }
- OC_Log::write('core', 'starting upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG);
- $result=OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
- if(!$result) {
- echo 'Error while upgrading the database';
- die();
- }
- if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")) {
- $tmpl = new OC_Template( '', 'error', 'guest' );
- $tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'", 'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
- $tmpl->printPage();
- exit;
- }
- $minimizerCSS = new OC_Minimizer_CSS();
- $minimizerCSS->clearCache();
- $minimizerJS = new OC_Minimizer_JS();
- $minimizerJS->clearCache();
- OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
- OC_App::checkAppsRequirements();
- // load all apps to also upgrade enabled apps
- OC_App::loadApps();
- }
- }
- }
-
- public static function initTemplateEngine() {
- // Add the stuff we need always
- OC_Util::addScript( "jquery-1.7.2.min" );
- OC_Util::addScript( "jquery-ui-1.8.16.custom.min" );
- OC_Util::addScript( "jquery-showpassword" );
- OC_Util::addScript( "jquery.infieldlabel" );
- OC_Util::addScript( "jquery-tipsy" );
- OC_Util::addScript( "oc-dialogs" );
- OC_Util::addScript( "js" );
- OC_Util::addScript( "eventsource" );
- OC_Util::addScript( "config" );
- //OC_Util::addScript( "multiselect" );
- OC_Util::addScript('search', 'result');
- OC_Util::addScript('router');
-
- if( OC_Config::getValue( 'installed', false )) {
- if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ) {
- OC_Util::addScript( 'backgroundjobs' );
- }
- }
-
- OC_Util::addStyle( "styles" );
- OC_Util::addStyle( "multiselect" );
- OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
- OC_Util::addStyle( "jquery-tipsy" );
- }
-
- public static function initSession() {
- // prevents javascript from accessing php session cookies
- ini_set('session.cookie_httponly', '1;');
-
- // set the session name to the instance id - which is unique
- session_name(OC_Util::getInstanceId());
-
- // (re)-initialize session
- session_start();
-
- // regenerate session id periodically to avoid session fixation
- if (!isset($_SESSION['SID_CREATED'])) {
- $_SESSION['SID_CREATED'] = time();
- } else if (time() - $_SESSION['SID_CREATED'] > 900) {
- session_regenerate_id(true);
- $_SESSION['SID_CREATED'] = time();
- }
-
- // session timeout
- if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
- if (isset($_COOKIE[session_name()])) {
- setcookie(session_name(), '', time() - 42000, '/');
- }
- session_unset();
- session_destroy();
- session_start();
- }
- $_SESSION['LAST_ACTIVITY'] = time();
- }
-
- public static function getRouter() {
- if (!isset(OC::$router)) {
- OC::$router = new OC_Router();
- OC::$router->loadRoutes();
- }
-
- return OC::$router;
- }
-
- public static function init() {
- // register autoloader
- spl_autoload_register(array('OC', 'autoload'));
- setlocale(LC_ALL, 'en_US.UTF-8');
-
- // set some stuff
- //ob_start();
- error_reporting(E_ALL | E_STRICT);
- if (defined('DEBUG') && DEBUG) {
- ini_set('display_errors', 1);
- }
- self::$CLI=(php_sapi_name() == 'cli');
-
- date_default_timezone_set('UTC');
- ini_set('arg_separator.output', '&amp;');
-
- // try to switch magic quotes off.
- if(get_magic_quotes_gpc()) {
- @set_magic_quotes_runtime(false);
- }
-
- //try to configure php to enable big file uploads.
- //this doesn´t work always depending on the webserver and php configuration.
- //Let´s try to overwrite some defaults anyways
-
- //try to set the maximum execution time to 60min
- @set_time_limit(3600);
- @ini_set('max_execution_time', 3600);
- @ini_set('max_input_time', 3600);
-
- //try to set the maximum filesize to 10G
- @ini_set('upload_max_filesize', '10G');
- @ini_set('post_max_size', '10G');
- @ini_set('file_uploads', '50');
-
- //try to set the session lifetime to 60min
- @ini_set('gc_maxlifetime', '3600');
-
- //copy http auth headers for apache+php-fcgid work around
- if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
- $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
- }
-
- //set http auth headers for apache+php-cgi work around
- if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
- list($name, $password) = explode(':', base64_decode($matches[1]), 2);
- $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
- $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
- }
-
- //set http auth headers for apache+php-cgi work around if variable gets renamed by apache
- if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
- list($name, $password) = explode(':', base64_decode($matches[1]), 2);
- $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
- $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
- }
-
- self::initPaths();
-
- register_shutdown_function(array('OC_Log', 'onShutdown'));
- set_error_handler(array('OC_Log', 'onError'));
- set_exception_handler(array('OC_Log', 'onException'));
-
- // set debug mode if an xdebug session is active
- if (!defined('DEBUG') || !DEBUG) {
- if(isset($_COOKIE['XDEBUG_SESSION'])) {
- define('DEBUG', true);
- }
- }
-
- // register the stream wrappers
- require_once 'streamwrappers.php';
- stream_wrapper_register("fakedir", "OC_FakeDirStream");
- stream_wrapper_register('static', 'OC_StaticStreamWrapper');
- stream_wrapper_register('close', 'OC_CloseStreamWrapper');
-
- self::checkInstalled();
- self::checkSSL();
- self::initSession();
- self::initTemplateEngine();
- self::checkUpgrade();
-
- $errors=OC_Util::checkServer();
- if(count($errors)>0) {
- OC_Template::printGuestPage('', 'error', array('errors' => $errors));
- exit;
- }
-
- // User and Groups
- if( !OC_Config::getValue( "installed", false )) {
- $_SESSION['user_id'] = '';
- }
-
- OC_User::useBackend(new OC_User_Database());
- OC_Group::useBackend(new OC_Group_Database());
-
- if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id']) && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
- OC_User::logout();
- }
-
- // Load Apps
- // This includes plugins for users and filesystems as well
- global $RUNTIME_NOAPPS;
- global $RUNTIME_APPTYPES;
- if(!$RUNTIME_NOAPPS ) {
- if($RUNTIME_APPTYPES) {
- OC_App::loadApps($RUNTIME_APPTYPES);
- }else{
- OC_App::loadApps();
- }
- }
-
- //setup extra user backends
- OC_User::setupBackends();
-
- self::registerCacheHooks();
- self::registerFilesystemHooks();
- self::registerShareHooks();
-
- //make sure temporary files are cleaned up
- register_shutdown_function(array('OC_Helper', 'cleanTmp'));
-
- //parse the given parameters
- self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
- if(substr_count(self::$REQUESTEDAPP, '?') != 0) {
- $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
- $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
- parse_str($param, $get);
- $_GET = array_merge($_GET, $get);
- self::$REQUESTEDAPP = $app;
- $_GET['app'] = $app;
- }
- self::$REQUESTEDFILE = (isset($_GET['getfile'])?$_GET['getfile']:null);
- if(substr_count(self::$REQUESTEDFILE, '?') != 0) {
- $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
- $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
- parse_str($param, $get);
- $_GET = array_merge($_GET, $get);
- self::$REQUESTEDFILE = $file;
- $_GET['getfile'] = $file;
- }
- if(!is_null(self::$REQUESTEDFILE)) {
- $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
- $parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
- if(!OC_Helper::issubdirectory($subdir, $parent)) {
- self::$REQUESTEDFILE = null;
- header('HTTP/1.0 404 Not Found');
- exit;
- }
- }
- }
-
- /**
- * register hooks for the cache
- */
- public static function registerCacheHooks() {
- // register cache cleanup jobs
- OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
- OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
- }
-
- /**
- * register hooks for the filesystem
- */
- public static function registerFilesystemHooks() {
- // Check for blacklisted files
- OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
- OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
- }
-
- /**
- * register hooks for sharing
- */
- public static function registerShareHooks() {
- OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
- OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
- OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
- OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
- }
-
- /**
- * @brief Handle the request
- */
- public static function handleRequest() {
- if (!OC_Config::getValue('installed', false)) {
- require_once 'core/setup.php';
- exit();
- }
- // Handle redirect URL for logged in users
- if(isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
- $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
- header( 'Location: '.$location );
- return;
- }
- // Handle WebDAV
- if($_SERVER['REQUEST_METHOD']=='PROPFIND') {
- header('location: '.OC_Helper::linkToRemote('webdav'));
- return;
- }
- try {
- OC::getRouter()->match(OC_Request::getPathInfo());
- return;
- } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
- //header('HTTP/1.0 404 Not Found');
- } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
- OC_Response::setStatus(405);
- return;
- }
- $app = OC::$REQUESTEDAPP;
- $file = OC::$REQUESTEDFILE;
- $param = array('app' => $app, 'file' => $file);
- // Handle app css files
- if(substr($file, -3) == 'css') {
- self::loadCSSFile($param);
- return;
- }
- // Someone is logged in :
- if(OC_User::isLoggedIn()) {
- OC_App::loadApps();
- OC_User::setupBackends();
- if(isset($_GET["logout"]) and ($_GET["logout"])) {
- OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
- OC_User::logout();
- header("Location: ".OC::$WEBROOT.'/');
- }else{
- if(is_null($file)) {
- $param['file'] = 'index.php';
- }
- $file_ext = substr($param['file'], -3);
- if ($file_ext != 'php'
- || !self::loadAppScriptFile($param)) {
- header('HTTP/1.0 404 Not Found');
- }
- }
- return;
- }
- // Not handled and not logged in
- self::handleLogin();
- }
-
- public static function loadAppScriptFile($param) {
- OC_App::loadApps();
- $app = $param['app'];
- $file = $param['file'];
- $app_path = OC_App::getAppPath($app);
- $file = $app_path . '/' . $file;
- unset($app, $app_path);
- if (file_exists($file)) {
- require_once $file;
- return true;
- }
- return false;
- }
-
- public static function loadCSSFile($param) {
- $app = $param['app'];
- $file = $param['file'];
- $app_path = OC_App::getAppPath($app);
- if (file_exists($app_path . '/' . $file)) {
- $app_web_path = OC_App::getAppWebPath($app);
- $filepath = $app_web_path . '/' . $file;
- $minimizer = new OC_Minimizer_CSS();
- $info = array($app_path, $app_web_path, $file);
- $minimizer->output(array($info), $filepath);
- }
- }
-
- protected static function handleLogin() {
- OC_App::loadApps(array('prelogin'));
- $error = array();
- // remember was checked after last login
- if (OC::tryRememberLogin()) {
- $error[] = 'invalidcookie';
-
- // Someone wants to log in :
- } elseif (OC::tryFormLogin()) {
- $error[] = 'invalidpassword';
-
- // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
- } elseif (OC::tryBasicAuthLogin()) {
- $error[] = 'invalidpassword';
- }
- OC_Util::displayLoginPage(array_unique($error));
- }
-
- protected static function cleanupLoginTokens($user) {
- $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15);
- $tokens = OC_Preferences::getKeys($user, 'login_token');
- foreach($tokens as $token) {
- $time = OC_Preferences::getValue($user, 'login_token', $token);
- if ($time < $cutoff) {
- OC_Preferences::deleteKey($user, 'login_token', $token);
- }
- }
- }
-
- protected static function tryRememberLogin() {
- if(!isset($_COOKIE["oc_remember_login"])
- || !isset($_COOKIE["oc_token"])
- || !isset($_COOKIE["oc_username"])
- || !$_COOKIE["oc_remember_login"]) {
- return false;
- }
- OC_App::loadApps(array('authentication'));
- if(defined("DEBUG") && DEBUG) {
- OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
- }
- // confirm credentials in cookie
- if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
- // delete outdated cookies
- self::cleanupLoginTokens($_COOKIE['oc_username']);
- // get stored tokens
- $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
- // test cookies token against stored tokens
- if (in_array($_COOKIE['oc_token'], $tokens, true)) {
- // replace successfully used token with a new one
- OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
- $token = OC_Util::generate_random_bytes(32);
- OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
- OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
- // login
- OC_User::setUserId($_COOKIE['oc_username']);
- OC_Util::redirectToDefaultPage();
- // doesn't return
- }
- // if you reach this point you have changed your password
- // or you are an attacker
- // we can not delete tokens here because users may reach
- // this point multiple times after a password change
- OC_Log::write('core', 'Authentication cookie rejected for user '.$_COOKIE['oc_username'], OC_Log::WARN);
- }
- OC_User::unsetMagicInCookie();
- return true;
- }
-
- protected static function tryFormLogin() {
- if(!isset($_POST["user"]) || !isset($_POST['password'])) {
- return false;
- }
-
- OC_App::loadApps();
-
- //setup extra user backends
- OC_User::setupBackends();
-
- if(OC_User::login($_POST["user"], $_POST["password"])) {
- self::cleanupLoginTokens($_POST['user']);
- if(!empty($_POST["remember_login"])) {
- if(defined("DEBUG") && DEBUG) {
- OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
- }
- $token = OC_Util::generate_random_bytes(32);
- OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
- OC_User::setMagicInCookie($_POST["user"], $token);
- }
- else {
- OC_User::unsetMagicInCookie();
- }
- OC_Util::redirectToDefaultPage();
- exit();
- }
- return true;
- }
-
- protected static function tryBasicAuthLogin() {
- if (!isset($_SERVER["PHP_AUTH_USER"])
- || !isset($_SERVER["PHP_AUTH_PW"])) {
- return false;
- }
- OC_App::loadApps(array('authentication'));
- if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
- //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
- OC_User::unsetMagicInCookie();
- $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
- OC_Util::redirectToDefaultPage();
- }
- return true;
- }
+class OC
+{
+ /**
+ * Assoziative array for autoloading. classname => filename
+ */
+ public static $CLASSPATH = array();
+ /**
+ * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
+ */
+ public static $SERVERROOT = '';
+ /**
+ * the current request path relative to the owncloud root (e.g. files/index.php)
+ */
+ private static $SUBURI = '';
+ /**
+ * the owncloud root path for http requests (e.g. owncloud/)
+ */
+ public static $WEBROOT = '';
+ /**
+ * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
+ */
+ public static $THIRDPARTYROOT = '';
+ /**
+ * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
+ */
+ public static $THIRDPARTYWEBROOT = '';
+ /**
+ * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
+ * web path in 'url'
+ */
+ public static $APPSROOTS = array();
+ /*
+ * requested app
+ */
+ public static $REQUESTEDAPP = '';
+ /*
+ * requested file of app
+ */
+ public static $REQUESTEDFILE = '';
+ /**
+ * check if owncloud runs in cli mode
+ */
+ public static $CLI = false;
+ /*
+ * OC router
+ */
+ protected static $router = null;
+
+ /**
+ * SPL autoload
+ */
+ public static function autoload($className)
+ {
+ if (array_key_exists($className, OC::$CLASSPATH)) {
+ $path = OC::$CLASSPATH[$className];
+ /** @TODO: Remove this when necessary
+ Remove "apps/" from inclusion path for smooth migration to mutli app dir
+ */
+ if (strpos($path, 'apps/') === 0) {
+ OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
+ $path = str_replace('apps/', '', $path);
+ }
+ } elseif (strpos($className, 'OC_') === 0) {
+ $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'OC\\') === 0) {
+ $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'OCP\\') === 0) {
+ $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'OCA\\') === 0) {
+ $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+ } elseif (strpos($className, 'Sabre_') === 0) {
+ $path = str_replace('_', '/', $className) . '.php';
+ } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
+ $path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
+ } elseif (strpos($className, 'Sabre\\VObject') === 0) {
+ $path = str_replace('\\', '/', $className) . '.php';
+ } elseif (strpos($className, 'Test_') === 0) {
+ $path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
+ } else {
+ return false;
+ }
+
+ if ($fullPath = stream_resolve_include_path($path)) {
+ require_once $fullPath;
+ }
+ return false;
+ }
+
+ public static function initPaths()
+ {
+ // calculate the root directories
+ OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+ OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
+ $scriptName = $_SERVER["SCRIPT_NAME"];
+ if (substr($scriptName, -1) == '/') {
+ $scriptName .= 'index.php';
+ //make sure suburi follows the same rules as scriptName
+ if (substr(OC::$SUBURI, -9) != 'index.php') {
+ if (substr(OC::$SUBURI, -1) != '/') {
+ OC::$SUBURI = OC::$SUBURI . '/';
+ }
+ OC::$SUBURI = OC::$SUBURI . 'index.php';
+ }
+ }
+
+ OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI));
+
+ if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') {
+ OC::$WEBROOT = '/' . OC::$WEBROOT;
+ }
+
+ // ensure we can find OC_Config
+ set_include_path(
+ OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+ get_include_path()
+ );
+
+ // search the 3rdparty folder
+ if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') {
+ OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', '');
+ OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', '');
+ } elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) {
+ OC::$THIRDPARTYROOT = OC::$SERVERROOT;
+ OC::$THIRDPARTYWEBROOT = OC::$WEBROOT;
+ } elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) {
+ OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
+ OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
+ } else {
+ echo("3rdparty directory not found! Please put the ownCloud 3rdparty folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+ exit;
+ }
+ // search the apps folder
+ $config_paths = OC_Config::getValue('apps_paths', array());
+ if (!empty($config_paths)) {
+ foreach ($config_paths as $paths) {
+ if (isset($paths['url']) && isset($paths['path'])) {
+ $paths['url'] = rtrim($paths['url'], '/');
+ $paths['path'] = rtrim($paths['path'], '/');
+ OC::$APPSROOTS[] = $paths;
+ }
+ }
+ } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+ OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
+ } elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+ OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true);
+ }
+
+ if (empty(OC::$APPSROOTS)) {
+ echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file.");
+ exit;
+ }
+ $paths = array();
+ foreach (OC::$APPSROOTS as $path)
+ $paths[] = $path['path'];
+
+ // set the right include path
+ set_include_path(
+ OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+ OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
+ OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
+ implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+ get_include_path() . PATH_SEPARATOR .
+ OC::$SERVERROOT
+ );
+ }
+
+ public static function checkInstalled()
+ {
+ // Redirect to installer if not installed
+ if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+ if (!OC::$CLI) {
+ $url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
+ header("Location: $url");
+ }
+ exit();
+ }
+ }
+
+ public static function checkSSL()
+ {
+ // redirect to https site if configured
+ if (OC_Config::getValue("forcessl", false)) {
+ header('Strict-Transport-Security: max-age=31536000');
+ ini_set("session.cookie_secure", "on");
+ if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) {
+ $url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
+ header("Location: $url");
+ exit();
+ }
+ }
+ }
+
+ public static function checkUpgrade()
+ {
+ if (OC_Config::getValue('installed', false)) {
+ $installedVersion = OC_Config::getValue('version', '0.0.0');
+ $currentVersion = implode('.', OC_Util::getVersion());
+ if (version_compare($currentVersion, $installedVersion, '>')) {
+ // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions
+ if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+ if (!OC_Util::ishtaccessworking()) {
+ if (!file_exists(OC::$SERVERROOT . '/data/.htaccess')) {
+ OC_Setup::protectDataDirectory();
+ }
+ }
+ }
+ OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG);
+ $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT . '/db_structure.xml');
+ if (!$result) {
+ echo 'Error while upgrading the database';
+ die();
+ }
+ if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
+ $tmpl = new OC_Template('', 'error', 'guest');
+ $tmpl->assign('errors', array(1 => array('error' => "Can't write into config directory 'config'", 'hint' => "You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+ $tmpl->printPage();
+ exit;
+ }
+ $minimizerCSS = new OC_Minimizer_CSS();
+ $minimizerCSS->clearCache();
+ $minimizerJS = new OC_Minimizer_JS();
+ $minimizerJS->clearCache();
+ OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
+ OC_App::checkAppsRequirements();
+ // load all apps to also upgrade enabled apps
+ OC_App::loadApps();
+ }
+ }
+ }
+
+ public static function initTemplateEngine()
+ {
+ // Add the stuff we need always
+ OC_Util::addScript("jquery-1.7.2.min");
+ OC_Util::addScript("jquery-ui-1.8.16.custom.min");
+ OC_Util::addScript("jquery-showpassword");
+ OC_Util::addScript("jquery.infieldlabel");
+ OC_Util::addScript("jquery-tipsy");
+ OC_Util::addScript("oc-dialogs");
+ OC_Util::addScript("js");
+ OC_Util::addScript("eventsource");
+ OC_Util::addScript("config");
+ //OC_Util::addScript( "multiselect" );
+ OC_Util::addScript('search', 'result');
+ OC_Util::addScript('router');
+
+ if (OC_Config::getValue('installed', false)) {
+ if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
+ OC_Util::addScript('backgroundjobs');
+ }
+ }
+
+ OC_Util::addStyle("styles");
+ OC_Util::addStyle("multiselect");
+ OC_Util::addStyle("jquery-ui-1.8.16.custom");
+ OC_Util::addStyle("jquery-tipsy");
+ }
+
+ public static function initSession()
+ {
+ // prevents javascript from accessing php session cookies
+ ini_set('session.cookie_httponly', '1;');
+
+ // set the session name to the instance id - which is unique
+ session_name(OC_Util::getInstanceId());
+
+ // (re)-initialize session
+ session_start();
+
+ // regenerate session id periodically to avoid session fixation
+ if (!isset($_SESSION['SID_CREATED'])) {
+ $_SESSION['SID_CREATED'] = time();
+ } else if (time() - $_SESSION['SID_CREATED'] > 900) {
+ session_regenerate_id(true);
+ $_SESSION['SID_CREATED'] = time();
+ }
+
+ // session timeout
+ if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
+ if (isset($_COOKIE[session_name()])) {
+ setcookie(session_name(), '', time() - 42000, '/');
+ }
+ session_unset();
+ session_destroy();
+ session_start();
+ }
+ $_SESSION['LAST_ACTIVITY'] = time();
+ }
+
+ public static function getRouter()
+ {
+ if (!isset(OC::$router)) {
+ OC::$router = new OC_Router();
+ OC::$router->loadRoutes();
+ }
+
+ return OC::$router;
+ }
+
+ public static function init()
+ {
+ // register autoloader
+ spl_autoload_register(array('OC', 'autoload'));
+ setlocale(LC_ALL, 'en_US.UTF-8');
+
+ // set some stuff
+ //ob_start();
+ error_reporting(E_ALL | E_STRICT);
+ if (defined('DEBUG') && DEBUG) {
+ ini_set('display_errors', 1);
+ }
+ self::$CLI = (php_sapi_name() == 'cli');
+
+ date_default_timezone_set('UTC');
+ ini_set('arg_separator.output', '&amp;');
+
+ // try to switch magic quotes off.
+ if (get_magic_quotes_gpc()) {
+ @set_magic_quotes_runtime(false);
+ }
+
+ //try to configure php to enable big file uploads.
+ //this doesn´t work always depending on the webserver and php configuration.
+ //Let´s try to overwrite some defaults anyways
+
+ //try to set the maximum execution time to 60min
+ @set_time_limit(3600);
+ @ini_set('max_execution_time', 3600);
+ @ini_set('max_input_time', 3600);
+
+ //try to set the maximum filesize to 10G
+ @ini_set('upload_max_filesize', '10G');
+ @ini_set('post_max_size', '10G');
+ @ini_set('file_uploads', '50');
+
+ //try to set the session lifetime to 60min
+ @ini_set('gc_maxlifetime', '3600');
+
+ //copy http auth headers for apache+php-fcgid work around
+ if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+ $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+ }
+
+ //set http auth headers for apache+php-cgi work around
+ if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
+ list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+ $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+ $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+ }
+
+ //set http auth headers for apache+php-cgi work around if variable gets renamed by apache
+ if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
+ list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+ $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+ $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+ }
+
+ self::initPaths();
+
+ register_shutdown_function(array('OC_Log', 'onShutdown'));
+ set_error_handler(array('OC_Log', 'onError'));
+ set_exception_handler(array('OC_Log', 'onException'));
+
+ // set debug mode if an xdebug session is active
+ if (!defined('DEBUG') || !DEBUG) {
+ if (isset($_COOKIE['XDEBUG_SESSION'])) {
+ define('DEBUG', true);
+ }
+ }
+
+ // register the stream wrappers
+ require_once 'streamwrappers.php';
+ stream_wrapper_register("fakedir", "OC_FakeDirStream");
+ stream_wrapper_register('static', 'OC_StaticStreamWrapper');
+ stream_wrapper_register('close', 'OC_CloseStreamWrapper');
+
+ self::checkInstalled();
+ self::checkSSL();
+ self::initSession();
+ self::initTemplateEngine();
+ self::checkUpgrade();
+
+ $errors = OC_Util::checkServer();
+ if (count($errors) > 0) {
+ OC_Template::printGuestPage('', 'error', array('errors' => $errors));
+ exit;
+ }
+
+ // User and Groups
+ if (!OC_Config::getValue("installed", false)) {
+ $_SESSION['user_id'] = '';
+ }
+
+ OC_User::useBackend(new OC_User_Database());
+ OC_Group::useBackend(new OC_Group_Database());
+
+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id']) && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
+ OC_User::logout();
+ }
+
+ // Load Apps
+ // This includes plugins for users and filesystems as well
+ global $RUNTIME_NOAPPS;
+ global $RUNTIME_APPTYPES;
+ if (!$RUNTIME_NOAPPS) {
+ if ($RUNTIME_APPTYPES) {
+ OC_App::loadApps($RUNTIME_APPTYPES);
+ } else {
+ OC_App::loadApps();
+ }
+ }
+
+ //setup extra user backends
+ OC_User::setupBackends();
+
+ self::registerCacheHooks();
+ self::registerFilesystemHooks();
+ self::registerShareHooks();
+
+ //make sure temporary files are cleaned up
+ register_shutdown_function(array('OC_Helper', 'cleanTmp'));
+
+ //parse the given parameters
+ self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
+ if (substr_count(self::$REQUESTEDAPP, '?') != 0) {
+ $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
+ $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
+ parse_str($param, $get);
+ $_GET = array_merge($_GET, $get);
+ self::$REQUESTEDAPP = $app;
+ $_GET['app'] = $app;
+ }
+ self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null);
+ if (substr_count(self::$REQUESTEDFILE, '?') != 0) {
+ $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
+ $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
+ parse_str($param, $get);
+ $_GET = array_merge($_GET, $get);
+ self::$REQUESTEDFILE = $file;
+ $_GET['getfile'] = $file;
+ }
+ if (!is_null(self::$REQUESTEDFILE)) {
+ $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
+ $parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
+ if (!OC_Helper::issubdirectory($subdir, $parent)) {
+ self::$REQUESTEDFILE = null;
+ header('HTTP/1.0 404 Not Found');
+ exit;
+ }
+ }
+
+ // write error into log if locale can't be set
+ if (OC_Util::issetlocaleworking() == false) {
+ OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
+ }
+ }
+
+ /**
+ * register hooks for the cache
+ */
+ public static function registerCacheHooks()
+ {
+ // register cache cleanup jobs
+ OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
+ OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+ }
+
+ /**
+ * register hooks for the filesystem
+ */
+ public static function registerFilesystemHooks()
+ {
+ // Check for blacklisted files
+ OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
+ OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
+ }
+
+ /**
+ * register hooks for sharing
+ */
+ public static function registerShareHooks()
+ {
+ OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+ OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+ OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+ OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+ }
+
+ /**
+ * @brief Handle the request
+ */
+ public static function handleRequest()
+ {
+ if (!OC_Config::getValue('installed', false)) {
+ require_once 'core/setup.php';
+ exit();
+ }
+ // Handle redirect URL for logged in users
+ if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
+ $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
+ header('Location: ' . $location);
+ return;
+ }
+ // Handle WebDAV
+ if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
+ header('location: ' . OC_Helper::linkToRemote('webdav'));
+ return;
+ }
+ try {
+ OC::getRouter()->match(OC_Request::getPathInfo());
+ return;
+ } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+ //header('HTTP/1.0 404 Not Found');
+ } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+ OC_Response::setStatus(405);
+ return;
+ }
+ $app = OC::$REQUESTEDAPP;
+ $file = OC::$REQUESTEDFILE;
+ $param = array('app' => $app, 'file' => $file);
+ // Handle app css files
+ if (substr($file, -3) == 'css') {
+ self::loadCSSFile($param);
+ return;
+ }
+ // Someone is logged in :
+ if (OC_User::isLoggedIn()) {
+ OC_App::loadApps();
+ OC_User::setupBackends();
+ if (isset($_GET["logout"]) and ($_GET["logout"])) {
+ OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
+ OC_User::logout();
+ header("Location: " . OC::$WEBROOT . '/');
+ } else {
+ if (is_null($file)) {
+ $param['file'] = 'index.php';
+ }
+ $file_ext = substr($param['file'], -3);
+ if ($file_ext != 'php'
+ || !self::loadAppScriptFile($param)
+ ) {
+ header('HTTP/1.0 404 Not Found');
+ }
+ }
+ return;
+ }
+ // Not handled and not logged in
+ self::handleLogin();
+ }
+
+ public static function loadAppScriptFile($param)
+ {
+ OC_App::loadApps();
+ $app = $param['app'];
+ $file = $param['file'];
+ $app_path = OC_App::getAppPath($app);
+ $file = $app_path . '/' . $file;
+ unset($app, $app_path);
+ if (file_exists($file)) {
+ require_once $file;
+ return true;
+ }
+ return false;
+ }
+
+ public static function loadCSSFile($param)
+ {
+ $app = $param['app'];
+ $file = $param['file'];
+ $app_path = OC_App::getAppPath($app);
+ if (file_exists($app_path . '/' . $file)) {
+ $app_web_path = OC_App::getAppWebPath($app);
+ $filepath = $app_web_path . '/' . $file;
+ $minimizer = new OC_Minimizer_CSS();
+ $info = array($app_path, $app_web_path, $file);
+ $minimizer->output(array($info), $filepath);
+ }
+ }
+
+ protected static function handleLogin()
+ {
+ OC_App::loadApps(array('prelogin'));
+ $error = array();
+ // remember was checked after last login
+ if (OC::tryRememberLogin()) {
+ $error[] = 'invalidcookie';
+
+ // Someone wants to log in :
+ } elseif (OC::tryFormLogin()) {
+ $error[] = 'invalidpassword';
+
+ // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+ } elseif (OC::tryBasicAuthLogin()) {
+ $error[] = 'invalidpassword';
+ }
+ OC_Util::displayLoginPage(array_unique($error));
+ }
+
+ protected static function cleanupLoginTokens($user)
+ {
+ $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+ $tokens = OC_Preferences::getKeys($user, 'login_token');
+ foreach ($tokens as $token) {
+ $time = OC_Preferences::getValue($user, 'login_token', $token);
+ if ($time < $cutoff) {
+ OC_Preferences::deleteKey($user, 'login_token', $token);
+ }
+ }
+ }
+
+ protected static function tryRememberLogin()
+ {
+ if (!isset($_COOKIE["oc_remember_login"])
+ || !isset($_COOKIE["oc_token"])
+ || !isset($_COOKIE["oc_username"])
+ || !$_COOKIE["oc_remember_login"]
+ ) {
+ return false;
+ }
+ OC_App::loadApps(array('authentication'));
+ if (defined("DEBUG") && DEBUG) {
+ OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
+ }
+ // confirm credentials in cookie
+ if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
+ // delete outdated cookies
+ self::cleanupLoginTokens($_COOKIE['oc_username']);
+ // get stored tokens
+ $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
+ // test cookies token against stored tokens
+ if (in_array($_COOKIE['oc_token'], $tokens, true)) {
+ // replace successfully used token with a new one
+ OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
+ $token = OC_Util::generate_random_bytes(32);
+ OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
+ OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
+ // login
+ OC_User::setUserId($_COOKIE['oc_username']);
+ OC_Util::redirectToDefaultPage();
+ // doesn't return
+ }
+ // if you reach this point you have changed your password
+ // or you are an attacker
+ // we can not delete tokens here because users may reach
+ // this point multiple times after a password change
+ OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
+ }
+ OC_User::unsetMagicInCookie();
+ return true;
+ }
+
+ protected static function tryFormLogin()
+ {
+ if (!isset($_POST["user"]) || !isset($_POST['password'])) {
+ return false;
+ }
+
+ OC_App::loadApps();
+
+ //setup extra user backends
+ OC_User::setupBackends();
+
+ if (OC_User::login($_POST["user"], $_POST["password"])) {
+ // setting up the time zone
+ if (isset($_POST['timezone-offset'])) {
+ $_SESSION['timezone'] = $_POST['timezone-offset'];
+ }
+
+ self::cleanupLoginTokens($_POST['user']);
+ if (!empty($_POST["remember_login"])) {
+ if (defined("DEBUG") && DEBUG) {
+ OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
+ }
+ $token = OC_Util::generate_random_bytes(32);
+ OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
+ OC_User::setMagicInCookie($_POST["user"], $token);
+ } else {
+ OC_User::unsetMagicInCookie();
+ }
+ OC_Util::redirectToDefaultPage();
+ exit();
+ }
+ return true;
+ }
+
+ protected static function tryBasicAuthLogin()
+ {
+ if (!isset($_SERVER["PHP_AUTH_USER"])
+ || !isset($_SERVER["PHP_AUTH_PW"])
+ ) {
+ return false;
+ }
+ OC_App::loadApps(array('authentication'));
+ if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+ //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+ OC_User::unsetMagicInCookie();
+ $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '');
+ OC_Util::redirectToDefaultPage();
+ }
+ return true;
+ }
}
// define runtime variables - unless this already has been done
-if( !isset( $RUNTIME_NOAPPS )) {
- $RUNTIME_NOAPPS = false;
+if (!isset($RUNTIME_NOAPPS)) {
+ $RUNTIME_NOAPPS = false;
}
-if(!function_exists('get_temp_dir')) {
- function get_temp_dir() {
- if( $temp=ini_get('upload_tmp_dir') ) return $temp;
- if( $temp=getenv('TMP') ) return $temp;
- if( $temp=getenv('TEMP') ) return $temp;
- if( $temp=getenv('TMPDIR') ) return $temp;
- $temp=tempnam(__FILE__, '');
- if (file_exists($temp)) {
- unlink($temp);
- return dirname($temp);
- }
- if( $temp=sys_get_temp_dir()) return $temp;
-
- return null;
- }
+if (!function_exists('get_temp_dir')) {
+ function get_temp_dir()
+ {
+ if ($temp = ini_get('upload_tmp_dir')) return $temp;
+ if ($temp = getenv('TMP')) return $temp;
+ if ($temp = getenv('TEMP')) return $temp;
+ if ($temp = getenv('TMPDIR')) return $temp;
+ $temp = tempnam(__FILE__, '');
+ if (file_exists($temp)) {
+ unlink($temp);
+ return dirname($temp);
+ }
+ if ($temp = sys_get_temp_dir()) return $temp;
+
+ return null;
+ }
}
OC::init();
diff --git a/lib/db.php b/lib/db.php
index 6524db7581a..7e60b41d230 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -445,9 +445,9 @@ class OC_DB {
* http://www.sqlite.org/lang_createtable.html
* http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
*/
- if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
- $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
- }
+ if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
+ $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
+ }
file_put_contents( $file2, $content );
diff --git a/lib/filecache.php b/lib/filecache.php
index bbf55bc1f86..c3256c783e6 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -355,7 +355,7 @@ class OC_FileCache{
if($sizeDiff==0) return;
$item = OC_FileCache_Cached::get($path);
//stop walking up the filetree if we hit a non-folder or reached to root folder
- if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory'){
+ if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory') {
return;
}
$id = $item['id'];
@@ -363,13 +363,13 @@ class OC_FileCache{
$query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?');
$query->execute(array($sizeDiff, $id));
$path=dirname($path);
- if($path == '' or $path =='/'){
+ if($path == '' or $path =='/') {
return;
}
$parent = OC_FileCache_Cached::get($path);
$id = $parent['id'];
//stop walking up the filetree if we hit a non-folder
- if($parent['mimetype'] !== 'httpd/unix-directory'){
+ if($parent['mimetype'] !== 'httpd/unix-directory') {
return;
}
}
diff --git a/lib/files.php b/lib/files.php
index b4a4145a493..69097e41074 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -197,7 +197,12 @@ class OC_Files {
}
OC_Util::obEnd();
if($zip or OC_Filesystem::is_readable($filename)) {
- header('Content-Disposition: attachment; filename="'.basename($filename).'"');
+ if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+ header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+ } else {
+ header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+ . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+ }
header('Content-Transfer-Encoding: binary');
OC_Response::disableCaching();
if($zip) {
@@ -207,6 +212,7 @@ class OC_Files {
self::addSendfileHeader($filename);
}else{
header('Content-Type: '.OC_Filesystem::getMimeType($filename));
+ header("Content-Length: ".OC_Filesystem::filesize($filename));
$storage = OC_Filesystem::getStorage($filename);
if ($storage instanceof OC_Filestorage_Local) {
self::addSendfileHeader(OC_Filesystem::getLocalFile($filename));
@@ -222,8 +228,6 @@ class OC_Files {
die('403 Forbidden');
}
if($only_header) {
- if(!$zip)
- header("Content-Length: ".OC_Filesystem::filesize($filename));
return ;
}
if($zip) {
@@ -492,7 +496,9 @@ class OC_Files {
if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
return OC_Helper::computerFileSize($size);
- } else { OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN); }
+ } else {
+ OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN);
+ }
return false;
}
diff --git a/lib/helper.php b/lib/helper.php
index 5dec7fadfb4..be4e4e52677 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -540,7 +540,7 @@ class OC_Helper {
mkdir($tmpDirNoClean);
}
$file=$tmpDirNoClean.md5(time().rand()).$postfix;
- $fh=fopen($file,'w');
+ $fh=fopen($file, 'w');
fclose($fh);
return $file;
}
diff --git a/lib/hook.php b/lib/hook.php
index 26a53693748..4da331bb5d8 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -59,7 +59,11 @@ class OC_Hook{
// Call all slots
foreach( self::$registered[$signalclass][$signalname] as $i ) {
- call_user_func( array( $i["class"], $i["name"] ), $params );
+ try {
+ call_user_func( array( $i["class"], $i["name"] ), $params );
+ } catch (Exception $e){
+ OC_Log::write('hook', 'error while running hook (' . $i["class"] . '::' . $i["name"] . '): '.$e->getMessage(), OC_Log::ERROR);
+ }
}
// return true
diff --git a/lib/l10n.php b/lib/l10n.php
index b83d8ff86db..f70dfa5e34e 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -115,10 +115,12 @@ class OC_L10N{
$i18ndir = self::findI18nDir($app);
// Localization is in /l10n, Texts are in $i18ndir
// (Just no need to define date/time format etc. twice)
- if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') ||
- OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') ||
- OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') ||
- OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
+ if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
+ || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
+ || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
+ || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
+ )
+ && file_exists($i18ndir.$lang.'.php')) {
// Include the file, save the data from $CONFIG
include strip_tags($i18ndir).strip_tags($lang).'.php';
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
@@ -294,12 +296,12 @@ class OC_L10N{
}
foreach($accepted_languages as $i) {
$temp = explode(';', $i);
- $temp[0] = str_replace('-','_',$temp[0]);
+ $temp[0] = str_replace('-', '_', $temp[0]);
if( ($key = array_search($temp[0], $available)) !== false) {
return $available[$key];
}
foreach($available as $l) {
- if ( $temp[0] == substr($l,0,2) ) {
+ if ( $temp[0] == substr($l, 0, 2) ) {
return $l;
}
}
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 3ae226f04fd..77e02dd77b1 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -5,5 +5,8 @@
"Users" => "المستخدمين",
"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
"Files" => "الملفات",
-"Text" => "معلومات إضافية"
+"Text" => "معلومات إضافية",
+"seconds ago" => "منذ ثواني",
+"1 minute ago" => "منذ دقيقة",
+"today" => "اليوم"
);
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 7458b329782..a0ab1f17014 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -14,16 +14,21 @@
"Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
"Files" => "Filer",
"Text" => "SMS",
+"Images" => "Billeder",
"seconds ago" => "sekunder siden",
"1 minute ago" => "1 minut siden",
"%d minutes ago" => "%d minutter siden",
+"1 hour ago" => "1 time siden",
+"%d hours ago" => "%d timer siden",
"today" => "I dag",
"yesterday" => "I går",
"%d days ago" => "%d dage siden",
"last month" => "Sidste måned",
+"%d months ago" => "%d måneder siden",
"last year" => "Sidste år",
"years ago" => "år siden",
"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgængelig. Få <a href=\"%s\">mere information</a>",
"up to date" => "opdateret",
-"updates check is disabled" => "Check for opdateringer er deaktiveret"
+"updates check is disabled" => "Check for opdateringer er deaktiveret",
+"Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\""
);
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index a06073e808a..5b3efffb22a 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -3,6 +3,32 @@
"Personal" => "Лично",
"Settings" => "Параметри",
"Users" => "Корисници",
+"Apps" => "Аппликации",
+"Admin" => "Админ",
+"ZIP download is turned off." => "Преземање во ZIP е исклучено",
+"Files need to be downloaded one by one." => "Датотеките треба да се симнат една по една.",
+"Back to Files" => "Назад кон датотеки",
+"Selected files too large to generate zip file." => "Избраните датотеки се преголеми за да се генерира zip.",
+"Application is not enabled" => "Апликацијата не е овозможена",
+"Authentication error" => "Грешка во автентикација",
+"Token expired. Please reload page." => "Жетонот е истечен. Ве молам превчитајте ја страницата.",
"Files" => "Датотеки",
-"Text" => "Текст"
+"Text" => "Текст",
+"Images" => "Слики",
+"seconds ago" => "пред секунди",
+"1 minute ago" => "пред 1 минута",
+"%d minutes ago" => "пред %d минути",
+"1 hour ago" => "пред 1 час",
+"%d hours ago" => "пред %d часови",
+"today" => "денеска",
+"yesterday" => "вчера",
+"%d days ago" => "пред %d денови",
+"last month" => "минатиот месец",
+"%d months ago" => "пред %d месеци",
+"last year" => "минатата година",
+"years ago" => "пред години",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>",
+"up to date" => "ажурно",
+"updates check is disabled" => "проверката за ажурирања е оневозможена",
+"Could not find category \"%s\"" => "Не можам да најдам категорија „%s“"
);
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 27912550e17..d3ce066c8c1 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -14,16 +14,21 @@
"Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.",
"Files" => "Fișiere",
"Text" => "Text",
+"Images" => "Imagini",
"seconds ago" => "secunde în urmă",
"1 minute ago" => "1 minut în urmă",
"%d minutes ago" => "%d minute în urmă",
+"1 hour ago" => "Acum o ora",
+"%d hours ago" => "%d ore in urma",
"today" => "astăzi",
"yesterday" => "ieri",
"%d days ago" => "%d zile în urmă",
"last month" => "ultima lună",
+"%d months ago" => "%d luni in urma",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
"%s is available. Get <a href=\"%s\">more information</a>" => "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>",
"up to date" => "la zi",
-"updates check is disabled" => "verificarea după actualizări este dezactivată"
+"updates check is disabled" => "verificarea după actualizări este dezactivată",
+"Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\""
);
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 69067d7ec57..9b7f1815fa3 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -3,7 +3,32 @@
"Personal" => "Kişisel",
"Settings" => "Ayarlar",
"Users" => "Kullanıcılar",
+"Apps" => "Uygulamalar",
+"Admin" => "Yönetici",
+"ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.",
+"Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.",
+"Back to Files" => "Dosyalara dön",
+"Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür.",
+"Application is not enabled" => "Uygulama etkinleştirilmedi",
"Authentication error" => "Kimlik doğrulama hatası",
+"Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
"Files" => "Dosyalar",
-"Text" => "Metin"
+"Text" => "Metin",
+"Images" => "Resimler",
+"seconds ago" => "saniye önce",
+"1 minute ago" => "1 dakika önce",
+"%d minutes ago" => "%d dakika önce",
+"1 hour ago" => "1 saat önce",
+"%d hours ago" => "%d saat önce",
+"today" => "bugün",
+"yesterday" => "dün",
+"%d days ago" => "%d gün önce",
+"last month" => "geçen ay",
+"%d months ago" => "%d ay önce",
+"last year" => "geçen yıl",
+"years ago" => "yıl önce",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s kullanılabilir durumda. <a href=\"%s\">Daha fazla bilgi</a> alın",
+"up to date" => "güncel",
+"updates check is disabled" => "güncelleme kontrolü kapalı",
+"Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı"
);
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index ec43208d833..e53dd5fefcd 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -33,8 +33,11 @@ class OC_Log_Owncloud {
* Init class data
*/
public static function init() {
- $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
- self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
+ $defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
+ self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
+ if (!file_exists(self::$logFile)) {
+ self::$logFile = $defaultLogFile;
+ }
}
/**
@@ -47,9 +50,11 @@ class OC_Log_Owncloud {
$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
if($level>=$minLevel) {
$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time());
- $fh=fopen(self::$logFile, 'a');
- fwrite($fh, json_encode($entry)."\n");
- fclose($fh);
+ $handle = @fopen(self::$logFile, 'a');
+ if ($handle) {
+ fwrite($handle, json_encode($entry)."\n");
+ fclose($handle);
+ }
}
}
diff --git a/lib/migrate.php b/lib/migrate.php
index 2cc0a3067b8..5ff8e338a44 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -78,67 +78,67 @@ class OC_Migrate{
* @param otional $path string path to zip output folder
* @return false on error, path to zip on success
*/
- public static function export( $uid=null, $type='user', $path=null ) {
+ public static function export( $uid=null, $type='user', $path=null ) {
$datadir = OC_Config::getValue( 'datadirectory' );
- // Validate export type
- $types = array( 'user', 'instance', 'system', 'userfiles' );
- if( !in_array( $type, $types ) ) {
- OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
- return json_encode( array( 'success' => false ) );
- }
- self::$exporttype = $type;
- // Userid?
- if( self::$exporttype == 'user' ) {
- // Check user exists
- self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
- if(!OC_User::userExists(self::$uid)) {
- return json_encode( array( 'success' => false) );
- }
- }
- // Calculate zipname
- if( self::$exporttype == 'user' ) {
- $zipname = 'oc_export_' . self::$uid . '_' . date("y-m-d_H-i-s") . '.zip';
- } else {
- $zipname = 'oc_export_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '.zip';
- }
- // Calculate path
- if( self::$exporttype == 'user' ) {
- self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname;
- } else {
- if( !is_null( $path ) ) {
- // Validate custom path
- if( !file_exists( $path ) || !is_writeable( $path ) ) {
- OC_Log::write( 'migration', 'Path supplied is invalid.', OC_Log::ERROR );
- return json_encode( array( 'success' => false ) );
- }
- self::$zippath = $path . $zipname;
- } else {
- // Default path
- self::$zippath = get_temp_dir() . '/' . $zipname;
- }
- }
- // Create the zip object
- if( !self::createZip() ) {
- return json_encode( array( 'success' => false ) );
- }
- // Do the export
- self::findProviders();
- $exportdata = array();
- switch( self::$exporttype ) {
- case 'user':
- // Connect to the db
- self::$dbpath = $datadir . '/' . self::$uid . '/migration.db';
- if( !self::connectDB() ) {
- return json_encode( array( 'success' => false ) );
- }
- self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 );
- // Export the app info
- $exportdata = self::exportAppData();
+ // Validate export type
+ $types = array( 'user', 'instance', 'system', 'userfiles' );
+ if( !in_array( $type, $types ) ) {
+ OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
+ return json_encode( array( 'success' => false ) );
+ }
+ self::$exporttype = $type;
+ // Userid?
+ if( self::$exporttype == 'user' ) {
+ // Check user exists
+ self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
+ if(!OC_User::userExists(self::$uid)) {
+ return json_encode( array( 'success' => false) );
+ }
+ }
+ // Calculate zipname
+ if( self::$exporttype == 'user' ) {
+ $zipname = 'oc_export_' . self::$uid . '_' . date("y-m-d_H-i-s") . '.zip';
+ } else {
+ $zipname = 'oc_export_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '.zip';
+ }
+ // Calculate path
+ if( self::$exporttype == 'user' ) {
+ self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname;
+ } else {
+ if( !is_null( $path ) ) {
+ // Validate custom path
+ if( !file_exists( $path ) || !is_writeable( $path ) ) {
+ OC_Log::write( 'migration', 'Path supplied is invalid.', OC_Log::ERROR );
+ return json_encode( array( 'success' => false ) );
+ }
+ self::$zippath = $path . $zipname;
+ } else {
+ // Default path
+ self::$zippath = get_temp_dir() . '/' . $zipname;
+ }
+ }
+ // Create the zip object
+ if( !self::createZip() ) {
+ return json_encode( array( 'success' => false ) );
+ }
+ // Do the export
+ self::findProviders();
+ $exportdata = array();
+ switch( self::$exporttype ) {
+ case 'user':
+ // Connect to the db
+ self::$dbpath = $datadir . '/' . self::$uid . '/migration.db';
+ if( !self::connectDB() ) {
+ return json_encode( array( 'success' => false ) );
+ }
+ self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 );
+ // Export the app info
+ $exportdata = self::exportAppData();
// Add the data dir to the zip
self::$content->addDir(OC_User::getHome(self::$uid), true, '/' );
- break;
- case 'instance':
- self::$content = new OC_Migration_Content( self::$zip );
+ break;
+ case 'instance':
+ self::$content = new OC_Migration_Content( self::$zip );
// Creates a zip that is compatable with the import function
$dbfile = tempnam( get_temp_dir(), "owncloud_export_data_" );
OC_DB::getDbStructure( $dbfile, 'MDB2_SCHEMA_DUMP_ALL');
@@ -155,32 +155,32 @@ class OC_Migrate{
foreach(OC_User::getUsers() as $user) {
self::$content->addDir(OC_User::getHome($user), true, "/userdata/" );
}
- break;
+ break;
case 'userfiles':
self::$content = new OC_Migration_Content( self::$zip );
// Creates a zip with all of the users files
foreach(OC_User::getUsers() as $user) {
self::$content->addDir(OC_User::getHome($user), true, "/" );
}
- break;
+ break;
case 'system':
self::$content = new OC_Migration_Content( self::$zip );
// Creates a zip with the owncloud system files
self::$content->addDir( OC::$SERVERROOT . '/', false, '/');
foreach (array(".git", "3rdparty", "apps", "core", "files", "l10n", "lib", "ocs", "search", "settings", "tests") as $dir) {
- self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/");
+ self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/");
}
- break;
- }
- if( !$info = self::getExportInfo( $exportdata ) ) {
- return json_encode( array( 'success' => false ) );
- }
- // Add the export info json to the export zip
- self::$content->addFromString( $info, 'export_info.json' );
- if( !self::$content->finish() ) {
- return json_encode( array( 'success' => false ) );
- }
- return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
+ break;
+ }
+ if( !$info = self::getExportInfo( $exportdata ) ) {
+ return json_encode( array( 'success' => false ) );
+ }
+ // Add the export info json to the export zip
+ self::$content->addFromString( $info, 'export_info.json' );
+ if( !self::$content->finish() ) {
+ return json_encode( array( 'success' => false ) );
+ }
+ return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
}
/**
@@ -254,7 +254,7 @@ class OC_Migrate{
OC_Log::write( 'migration', 'Failed to delete the extracted zip', OC_Log::ERROR );
}
return json_encode( array( 'success' => true, 'data' => $appsimported ) );
- break;
+ break;
case 'instance':
/*
* EXPERIMENTAL
@@ -281,7 +281,7 @@ class OC_Migrate{
// Done
return json_encode( array( 'success' => true ) );
*/
- break;
+ break;
}
}
@@ -319,10 +319,10 @@ class OC_Migrate{
static private function extractZip( $path ) {
self::$zip = new ZipArchive;
// Validate path
- if( !file_exists( $path ) ) {
- OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
- return false;
- }
+ if( !file_exists( $path ) ) {
+ OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
+ return false;
+ }
if ( self::$zip->open( $path ) != true ) {
OC_Log::write( 'migration', "Failed to open zip file", OC_Log::ERROR );
return false;
@@ -555,9 +555,9 @@ class OC_Migrate{
if ( self::$zip->open( self::$zippath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE ) !== true ) {
OC_Log::write('migration', 'Failed to create the zip with error: '.self::$zip->getStatusString(), OC_Log::ERROR);
return false;
- } else {
- return true;
- }
+ } else {
+ return true;
+ }
}
/**
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 12e5026a877..24081425f1e 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -44,10 +44,10 @@ class OC_OCSClient{
* @returns string of the KB server
* This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
*/
- private static function getKBURL() {
- $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
- return($url);
- }
+ private static function getKBURL() {
+ $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
+ return($url);
+ }
/**
* @brief Get the content of an OCS url call.
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 4cf57ed8ff2..88d812e735a 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -54,29 +54,30 @@ namespace OCP {
* Example:
* Following function shows how to search for contacts for the name and the email address.
*
- * public static function getMatchingRecipient($term) {
- * // The API is not active -> nothing to do
+ * public static function getMatchingRecipient($term) {
+ * // The API is not active -> nothing to do
* if (!\OCP\Contacts::isEnabled()) {
- * return array();
+ * return array();
* }
*
* $result = \OCP\Contacts::search($term, array('FN', 'EMAIL'));
* $receivers = array();
* foreach ($result as $r) {
- * $id = $r['id'];
- * $fn = $r['FN'];
- * $email = $r['EMAIL'];
- * if (!is_array($email)) {
- * $email = array($email);
- * }
+ * $id = $r['id'];
+ * $fn = $r['FN'];
+ * $email = $r['EMAIL'];
+ * if (!is_array($email)) {
+ * $email = array($email);
+ * }
*
- * // loop through all email addresses of this contact
- * foreach ($email as $e) {
- * $displayName = $fn . " <$e>";
- * $receivers[] = array('id' => $id,
- * 'label' => $displayName,
- * 'value' => $displayName);
- * }
+ * // loop through all email addresses of this contact
+ * foreach ($email as $e) {
+ * $displayName = $fn . " <$e>";
+ * $receivers[] = array(
+ * 'id' => $id,
+ * 'label' => $displayName,
+ * 'value' => $displayName);
+ * }
* }
*
* return $receivers;
diff --git a/lib/public/util.php b/lib/public/util.php
index 7b5b1abbded..af782b01483 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -173,6 +173,42 @@ class Util {
}
/**
+ * @brief returns the server hostname
+ * @returns the server hostname
+ *
+ * Returns the server host name without an eventual port number
+ */
+ public static function getServerHostName() {
+ $host_name = self::getServerHost();
+ // strip away port number (if existing)
+ $colon_pos = strpos($host_name, ':');
+ if ($colon_pos != FALSE) {
+ $host_name = substr($host_name, 0, $colon_pos);
+ }
+ return $host_name;
+ }
+
+ /**
+ * @brief Returns the default email address
+ * @param $user_part the user part of the address
+ * @returns the default email address
+ *
+ * Assembles a default email address (using the server hostname
+ * and the given user part, and returns it
+ * Example: when given lostpassword-noreply as $user_part param,
+ * and is currently accessed via http(s)://example.com/,
+ * it would return 'lostpassword-noreply@example.com'
+ */
+ public static function getDefaultEmailAddress($user_part) {
+ $host_name = self::getServerHostName();
+ // handle localhost installations
+ if ($host_name === 'localhost') {
+ $host_name = "example.com";
+ }
+ return $user_part.'@'.$host_name;
+ }
+
+ /**
* @brief Returns the server protocol
* @returns the server protocol
*
diff --git a/lib/request.php b/lib/request.php
index c975c84a711..99a77e1b59e 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -18,7 +18,7 @@ class OC_Request {
if(OC::$CLI) {
return 'localhost';
}
- if(OC_Config::getValue('overwritehost', '')<>''){
+ if(OC_Config::getValue('overwritehost', '')<>'') {
return OC_Config::getValue('overwritehost');
}
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -43,7 +43,7 @@ class OC_Request {
* Returns the server protocol. It respects reverse proxy servers and load balancers
*/
public static function serverProtocol() {
- if(OC_Config::getValue('overwriteprotocol', '')<>''){
+ if(OC_Config::getValue('overwriteprotocol', '')<>'') {
return OC_Config::getValue('overwriteprotocol');
}
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
@@ -74,7 +74,7 @@ class OC_Request {
switch($encoding) {
case 'ISO-8859-1' :
- $path_info = utf8_encode($path_info);
+ $path_info = utf8_encode($path_info);
}
// end copy
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 1a0570a270d..4173e008ba7 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -97,13 +97,13 @@ class OC_TemplateLayout extends OC_Template {
* @param $web base for path
* @param $file the filename
*/
- static public function appendIfExist(&$files, $root, $webroot, $file) {
- if (is_file($root.'/'.$file)) {
+ static public function appendIfExist(&$files, $root, $webroot, $file) {
+ if (is_file($root.'/'.$file)) {
$files[] = array($root, $webroot, $file);
return true;
- }
- return false;
- }
+ }
+ return false;
+ }
static public function findStylesheetFiles($styles) {
// Read the selected theme from the config file
@@ -130,8 +130,14 @@ class OC_TemplateLayout extends OC_Template {
// or in apps?
foreach( OC::$APPSROOTS as $apps_dir)
{
- if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) { $append =true; break; }
- elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { $append =true; break; }
+ if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) {
+ $append = true;
+ break;
+ }
+ elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) {
+ $append = true;
+ break;
+ }
}
if(! $append) {
echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -192,8 +198,14 @@ class OC_TemplateLayout extends OC_Template {
// Is it part of an app?
$append = false;
foreach( OC::$APPSROOTS as $apps_dir) {
- if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { $append =true; break; }
- elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { $append =true; break; }
+ if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) {
+ $append = true;
+ break;
+ }
+ elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) {
+ $append = true;
+ break;
+ }
}
if(! $append) {
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
diff --git a/lib/updater.php b/lib/updater.php
index 11081eded63..d44ac108380 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -52,18 +52,18 @@ class OC_Updater{
)
);
$xml=@file_get_contents($url, 0, $ctx);
- if($xml==false) {
- return array();
- }
- $data=@simplexml_load_string($xml);
+ if($xml==false) {
+ return array();
+ }
+ $data=@simplexml_load_string($xml);
$tmp=array();
- $tmp['version'] = $data->version;
- $tmp['versionstring'] = $data->versionstring;
- $tmp['url'] = $data->url;
- $tmp['web'] = $data->web;
+ $tmp['version'] = $data->version;
+ $tmp['versionstring'] = $data->versionstring;
+ $tmp['url'] = $data->url;
+ $tmp['web'] = $data->web;
- return $tmp;
+ return $tmp;
}
public static function ShowUpdatingHint() {
diff --git a/lib/util.php b/lib/util.php
index 34c4d4f9b11..4170de2125a 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -166,7 +166,7 @@ class OC_Util {
* @param int timestamp $timestamp
* @param bool dateOnly option to ommit time from the result
*/
- public static function formatDate( $timestamp, $dateOnly=false) {
+ public static function formatDate( $timestamp, $dateOnly=false) {
if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it
$systemTimeZone = intval(date('O'));
$systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100);
@@ -176,37 +176,8 @@ class OC_Util {
}
$l=OC_L10N::get('lib');
return $l->l($dateOnly ? 'date' : 'datetime', $timestamp);
- }
-
- /**
- * Shows a pagenavi widget where you can jump to different pages.
- *
- * @param int $pagecount
- * @param int $page
- * @param string $url
- * @return OC_Template
- */
- public static function getPageNavi($pagecount, $page, $url) {
-
- $pagelinkcount=8;
- if ($pagecount>1) {
- $pagestart=$page-$pagelinkcount;
- if($pagestart<0) $pagestart=0;
- $pagestop=$page+$pagelinkcount;
- if($pagestop>$pagecount) $pagestop=$pagecount;
-
- $tmpl = new OC_Template( '', 'part.pagenavi', '' );
- $tmpl->assign('page', $page);
- $tmpl->assign('pagecount', $pagecount);
- $tmpl->assign('pagestart', $pagestart);
- $tmpl->assign('pagestop', $pagestop);
- $tmpl->assign('url', $url);
- return $tmpl;
- }
}
-
-
/**
* check if the current server configuration is suitable for ownCloud
* @return array arrays with error messages and hints
@@ -331,8 +302,7 @@ class OC_Util {
$parameters[$value] = true;
}
if (!empty($_POST['user'])) {
- $parameters["username"] =
- OC_Util::sanitizeHTML($_POST['user']).'"';
+ $parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"';
$parameters['user_autofocus'] = false;
} else {
$parameters["username"] = '';
@@ -584,9 +554,21 @@ class OC_Util {
/**
+ * Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server.
+ */
+ public static function issetlocaleworking() {
+ $result=setlocale(LC_ALL, 'en_US.UTF-8');
+ if($result==false) {
+ return(false);
+ }else{
+ return(true);
+ }
+ }
+
+ /**
* Check if the ownCloud server can connect to the internet
*/
- public static function isinternetconnectionworking() {
+ public static function isinternetconnectionworking() {
// try to connect to owncloud.org to see if http connections to the internet are possible.
$connected = @fsockopen("www.owncloud.org", 80);
@@ -696,6 +678,12 @@ class OC_Util {
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
+ if(OC_Config::getValue('proxy','')<>'') {
+ curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
+ }
+ if(OC_Config::getValue('proxyuserpwd','')<>'') {
+ curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
+ }
$data = curl_exec($curl);
curl_close($curl);
@@ -711,8 +699,7 @@ class OC_Util {
$data=@file_get_contents($url, 0, $ctx);
}
-
return $data;
- }
+ }
}
diff --git a/settings/admin.php b/settings/admin.php
index 0cf449ef2ba..04905391138 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -30,6 +30,7 @@ $tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
+$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f82ece4aee1..83d455550ae 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,7 +7,7 @@ $success = true;
$username = $_POST["username"];
$group = $_POST["group"];
-if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')){
+if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
exit();
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2f70b003d56..4d0f6efd2c8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -68,3 +68,6 @@ span.securitywarning {color:#C33; font-weight:bold; }
span.connectionwarning {color:#933; font-weight:bold; }
input[type=radio] { width:1em; }
table.shareAPI td { padding-bottom: 0.8em; }
+
+/* HELP */
+.pressed {background-color:#DDD;}
diff --git a/settings/help.php b/settings/help.php
index 69a5ec9c146..cd3d615425c 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -12,15 +12,25 @@ OC_App::loadApps();
OC_Util::addStyle( "settings", "settings" );
OC_App::setActiveNavigationEntry( "help" );
-$pagesize=7;
-if(isset($_GET['page'])) $page=$_GET['page']; else $page=0;
-$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize);
-$totalitems=$kbe['totalitems'];
-unset($kbe['totalitems']);
-$pagecount=ceil($totalitems/$pagesize);
+
+if(isset($_GET['mode']) and $_GET['mode']=='admin') {
+ $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' );
+ $style1='';
+ $style2=' pressed';
+}else{
+ $url=OC_Helper::linkToAbsolute( 'core', 'doc/user' );
+ $style1=' pressed';
+ $style2='';
+}
+
+$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
+$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
$tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "kbe", $kbe );
-$tmpl->assign( "pagecount", $pagecount );
-$tmpl->assign( "page", $page );
+$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
+$tmpl->assign( "url", $url );
+$tmpl->assign( "url1", $url1 );
+$tmpl->assign( "url2", $url2 );
+$tmpl->assign( "style1", $style1 );
+$tmpl->assign( "style2", $style2 );
$tmpl->printPage();
diff --git a/settings/js/users.js b/settings/js/users.js
index f2ce69cf311..b0e30feb80c 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,405 +4,413 @@
* See the COPYING-README file.
*/
-var UserList={
- useUndo:true,
-
- /**
- * @brief Initiate user deletion process in UI
- * @param string uid the user ID to be deleted
- *
- * Does not actually delete the user; it sets them for
- * deletion when the current page is unloaded, at which point
- * finishDelete() completes the process. This allows for 'undo'.
- */
- do_delete:function( uid ) {
- if (typeof UserList.deleteUid !== 'undefined') {
- //Already a user in the undo queue
- UserList.finishDelete(null);
- }
- UserList.deleteUid = uid;
-
- // Set undo flag
- UserList.deleteCanceled = false;
-
- // Provide user with option to undo
- $('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
- $('#notification').data('deleteuser',true);
- $('#notification').fadeIn();
- },
-
- /**
- * @brief Delete a user via ajax
- * @param bool ready whether to use ready() upon completion
- *
- * Executes deletion via ajax of user identified by property deleteUid
- * if 'undo' has not been used. Completes the user deletion procedure
- * and reflects success in UI.
- */
- finishDelete:function( ready ){
-
- // Check deletion has not been undone
- if( !UserList.deleteCanceled && UserList.deleteUid ){
-
- // Delete user via ajax
- $.ajax({
- type: 'POST',
- url: OC.filePath('settings', 'ajax', 'removeuser.php'),
- async: false,
- data: { username: UserList.deleteUid },
- success: function(result) {
- if (result.status == 'success') {
- // Remove undo option, & remove user from table
- $('#notification').fadeOut();
- $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
- UserList.deleteCanceled = true;
- if (ready) {
- ready();
- }
- } else {
- oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
- }
- }
- });
- }
- },
+var UserList = {
+ useUndo:true,
- add:function(username, groups, subadmin, quota, sort) {
- var tr = $('tbody tr').first().clone();
- tr.attr('data-uid', username);
- tr.find('td.name').text(username);
- var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups"></select>').attr('data-username', username).attr('data-user-groups', groups);
- tr.find('td.groups').empty();
- if (tr.find('td.subadmins').length > 0) {
- var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
- tr.find('td.subadmins').empty();
- }
- var allGroups = String($('#content table').attr('data-groups')).split(', ');
- $.each(allGroups, function(i, group) {
- groupsSelect.append($('<option value="'+group+'">'+group+'</option>'));
- if (typeof subadminSelect !== 'undefined' && group != 'admin') {
- subadminSelect.append($('<option value="'+group+'">'+group+'</option>'));
- }
- });
- tr.find('td.groups').append(groupsSelect);
- UserList.applyMultiplySelect(groupsSelect);
- if (tr.find('td.subadmins').length > 0) {
- tr.find('td.subadmins').append(subadminSelect);
- UserList.applyMultiplySelect(subadminSelect);
- }
- if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
- var rm_img = $('<img>', {
- class: 'svg action',
- src: OC.imagePath('core','actions/delete'),
- alt: t('settings','Delete'),
- title: t('settings','Delete')
- });
- var rm_link = $('<a>', { class: 'action delete', href: '#'}).append(rm_img);
- tr.find('td.remove').append(rm_link);
- } else if (OC.currentUser == username) {
- tr.find('td.remove a').remove();
- }
- var quotaSelect = tr.find('select.quota-user');
- if (quota == 'default') {
- quotaSelect.find('option').attr('selected', null);
- quotaSelect.find('option').first().attr('selected', 'selected');
- quotaSelect.data('previous', 'default');
- } else {
- if (quotaSelect.find('option[value="'+quota+'"]').length > 0) {
- quotaSelect.find('option[value="'+quota+'"]').attr('selected', 'selected');
- } else {
- quotaSelect.append('<option value="'+quota+'" selected="selected">'+quota+'</option>');
- }
- }
- var added = false;
- if (sort) {
- username = username.toLowerCase();
- $('tbody tr').each(function() {
- if (username < $(this).attr('data-uid').toLowerCase()) {
- $(tr).insertBefore($(this));
- added = true;
- return false;
- }
- });
- }
- if (!added) {
- $(tr).appendTo('tbody');
- }
- return tr;
- },
+ /**
+ * @brief Initiate user deletion process in UI
+ * @param string uid the user ID to be deleted
+ *
+ * Does not actually delete the user; it sets them for
+ * deletion when the current page is unloaded, at which point
+ * finishDelete() completes the process. This allows for 'undo'.
+ */
+ do_delete:function (uid) {
+ if (typeof UserList.deleteUid !== 'undefined') {
+ //Already a user in the undo queue
+ UserList.finishDelete(null);
+ }
+ UserList.deleteUid = uid;
- update:function() {
- if (typeof UserList.offset === 'undefined') {
- UserList.offset = $('tbody tr').length;
- }
- $.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function(result) {
- if (result.status === 'success') {
- $.each(result.data, function(index, user) {
- var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
- UserList.offset++;
- if (index == 9) {
- $(tr).bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
- $(this).unbind(event);
- UserList.update();
- });
- }
- });
- }
- });
- },
+ // Set undo flag
+ UserList.deleteCanceled = false;
- applyMultiplySelect:function(element) {
- var checked=[];
- var user=element.attr('data-username');
- if($(element).attr('class') == 'groupsselect'){
- if(element.data('userGroups')){
- checked=String(element.data('userGroups')).split(', ');
- }
- if(user){
- var checkHandeler=function(group){
- if(user==OC.currentUser && group=='admin'){
- return false;
- }
- if(!isadmin && checked.length == 1 && checked[0] == group){
- return false;
- }
- $.post(
- OC.filePath('settings','ajax','togglegroups.php'),
- {
- username:user,
- group:group
- },
- function(){}
- );
- };
- }else{
- checkHandeler=false;
- }
- var addGroup = function(group) {
- $('select[multiple]').each(function(index, element) {
- if ($(element).find('option[value="'+group +'"]').length == 0) {
- $(element).append('<option value="'+group+'">'+group+'</option>');
- }
- })
- };
- var label;
- if(isadmin){
- label = t('core', 'add group');
- }else{
- label = null;
- }
- element.multiSelect({
- createCallback:addGroup,
- createText:label,
- checked:checked,
- oncheck:checkHandeler,
- onuncheck:checkHandeler,
- minWidth: 100,
- });
- }
- if($(element).attr('class') == 'subadminsselect'){
- if(element.data('subadmin')){
- checked=String(element.data('subadmin')).split(', ');
- }
- var checkHandeler=function(group){
- if(group=='admin'){
- return false;
- }
- $.post(
- OC.filePath('settings','ajax','togglesubadmins.php'),
- {
- username:user,
- group:group
- },
- function(){}
- );
- };
-
- var addSubAdmin = function(group) {
- $('select[multiple]').each(function(index, element) {
- if ($(element).find('option[value="'+group +'"]').length == 0) {
- $(element).append('<option value="'+group+'">'+group+'</option>');
- }
- })
- };
- element.multiSelect({
- createCallback:addSubAdmin,
- createText:null,
- checked:checked,
- oncheck:checkHandeler,
- onuncheck:checkHandeler,
- minWidth: 100,
- });
- }
- }
+ // Provide user with option to undo
+ $('#notification').html(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
+ $('#notification').data('deleteuser', true);
+ $('#notification').fadeIn();
+ },
+
+ /**
+ * @brief Delete a user via ajax
+ * @param bool ready whether to use ready() upon completion
+ *
+ * Executes deletion via ajax of user identified by property deleteUid
+ * if 'undo' has not been used. Completes the user deletion procedure
+ * and reflects success in UI.
+ */
+ finishDelete:function (ready) {
+
+ // Check deletion has not been undone
+ if (!UserList.deleteCanceled && UserList.deleteUid) {
+
+ // Delete user via ajax
+ $.ajax({
+ type:'POST',
+ url:OC.filePath('settings', 'ajax', 'removeuser.php'),
+ async:false,
+ data:{ username:UserList.deleteUid },
+ success:function (result) {
+ if (result.status == 'success') {
+ // Remove undo option, & remove user from table
+ $('#notification').fadeOut();
+ $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+ UserList.deleteCanceled = true;
+ if (ready) {
+ ready();
+ }
+ } else {
+ oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
+ }
+ }
+ });
+ }
+ },
+
+ add:function (username, groups, subadmin, quota, sort) {
+ var tr = $('tbody tr').first().clone();
+ tr.attr('data-uid', username);
+ tr.find('td.name').text(username);
+ var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
+ tr.find('td.groups').empty();
+ if (tr.find('td.subadmins').length > 0) {
+ var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+ tr.find('td.subadmins').empty();
+ }
+ var allGroups = String($('#content table').attr('data-groups')).split(', ');
+ $.each(allGroups, function (i, group) {
+ groupsSelect.append($('<option value="' + group + '">' + group + '</option>'));
+ if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+ subadminSelect.append($('<option value="' + group + '">' + group + '</option>'));
+ }
+ });
+ tr.find('td.groups').append(groupsSelect);
+ UserList.applyMultiplySelect(groupsSelect);
+ if (tr.find('td.subadmins').length > 0) {
+ tr.find('td.subadmins').append(subadminSelect);
+ UserList.applyMultiplySelect(subadminSelect);
+ }
+ if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+ var rm_img = $('<img>', {
+ class:'svg action',
+ src:OC.imagePath('core', 'actions/delete')
+ });
+ var rm_link = $('<a>', { class:'action delete', href:'#', 'original-title':t('settings', 'Delete')}).append(rm_img);
+ tr.find('td.remove').append(rm_link);
+ } else if (OC.currentUser == username) {
+ tr.find('td.remove a').remove();
+ }
+ var quotaSelect = tr.find('select.quota-user');
+ if (quota == 'default') {
+ quotaSelect.find('option').attr('selected', null);
+ quotaSelect.find('option').first().attr('selected', 'selected');
+ quotaSelect.data('previous', 'default');
+ } else {
+ if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+ quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+ } else {
+ quotaSelect.append('<option value="' + quota + '" selected="selected">' + quota + '</option>');
+ }
+ }
+ var added = false;
+ if (sort) {
+ username = username.toLowerCase();
+ $('tbody tr').each(function () {
+ if (username < $(this).attr('data-uid').toLowerCase()) {
+ $(tr).insertBefore($(this));
+ added = true;
+ return false;
+ }
+ });
+ }
+ if (!added) {
+ $(tr).appendTo('tbody');
+ }
+ return tr;
+ },
+
+ update:function () {
+ if (typeof UserList.offset === 'undefined') {
+ UserList.offset = $('tbody tr').length;
+ }
+ $.get(OC.Router.generate('settings_ajax_userlist', { offset:UserList.offset }), function (result) {
+ if (result.status === 'success') {
+ $.each(result.data, function (index, user) {
+ var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+ UserList.offset++;
+ if (index == 9) {
+ $(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+ $(this).unbind(event);
+ UserList.update();
+ });
+ }
+ });
+ }
+ });
+ },
+
+ applyMultiplySelect:function (element) {
+ var checked = [];
+ var user = element.attr('data-username');
+ if ($(element).attr('class') == 'groupsselect') {
+ if (element.data('userGroups')) {
+ checked = String(element.data('userGroups')).split(', ');
+ }
+ if (user) {
+ var checkHandeler = function (group) {
+ if (user == OC.currentUser && group == 'admin') {
+ return false;
+ }
+ if (!isadmin && checked.length == 1 && checked[0] == group) {
+ return false;
+ }
+ $.post(
+ OC.filePath('settings', 'ajax', 'togglegroups.php'),
+ {
+ username:user,
+ group:group
+ },
+ function () {
+ }
+ );
+ };
+ } else {
+ checkHandeler = false;
+ }
+ var addGroup = function (group) {
+ $('select[multiple]').each(function (index, element) {
+ if ($(element).find('option[value="' + group + '"]').length == 0) {
+ $(element).append('<option value="' + group + '">' + group + '</option>');
+ }
+ })
+ };
+ var label;
+ if (isadmin) {
+ label = t('settings', 'add group');
+ } else {
+ label = null;
+ }
+ element.multiSelect({
+ createCallback:addGroup,
+ createText:label,
+ checked:checked,
+ oncheck:checkHandeler,
+ onuncheck:checkHandeler,
+ minWidth:100,
+ });
+ }
+ if ($(element).attr('class') == 'subadminsselect') {
+ if (element.data('subadmin')) {
+ checked = String(element.data('subadmin')).split(', ');
+ }
+ var checkHandeler = function (group) {
+ if (group == 'admin') {
+ return false;
+ }
+ $.post(
+ OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+ {
+ username:user,
+ group:group
+ },
+ function () {
+ }
+ );
+ };
+
+ var addSubAdmin = function (group) {
+ $('select[multiple]').each(function (index, element) {
+ if ($(element).find('option[value="' + group + '"]').length == 0) {
+ $(element).append('<option value="' + group + '">' + group + '</option>');
+ }
+ })
+ };
+ element.multiSelect({
+ createCallback:addSubAdmin,
+ createText:null,
+ checked:checked,
+ oncheck:checkHandeler,
+ onuncheck:checkHandeler,
+ minWidth:100,
+ });
+ }
+ }
}
-$(document).ready(function(){
+$(document).ready(function () {
+
+ $('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+ UserList.update();
+ });
+
+ function setQuota(uid, quota, ready) {
+ $.post(
+ OC.filePath('settings', 'ajax', 'setquota.php'),
+ {username:uid, quota:quota},
+ function (result) {
+ if (ready) {
+ ready(result.data.quota);
+ }
+ }
+ );
+ }
+
+
+ $('select[multiple]').each(function (index, element) {
+ UserList.applyMultiplySelect($(element));
+ });
+
+ $('td.remove>a').live('click', function (event) {
+ var row = $(this).parent().parent();
+ var uid = $(row).attr('data-uid');
+ $(row).hide();
+ // Call function for handling delete/undo
+ UserList.do_delete(uid);
+ });
+
+ $('td.password>img').live('click', function (event) {
+ event.stopPropagation();
+ var img = $(this);
+ var uid = img.parent().parent().attr('data-uid');
+ var input = $('<input type="password">');
+ img.css('display', 'none');
+ img.parent().children('span').replaceWith(input);
+ input.focus();
+ input.keypress(function (event) {
+ if (event.keyCode == 13) {
+ if ($(this).val().length > 0) {
+ $.post(
+ OC.filePath('settings', 'ajax', 'changepassword.php'),
+ {username:uid, password:$(this).val()},
+ function (result) {
+ }
+ );
+ input.blur();
+ } else {
+ input.blur();
+ }
+ }
+ });
+ input.blur(function () {
+ $(this).replaceWith($('<span>●●●●●●●</span>'));
+ img.css('display', '');
+ });
+ });
+ $('td.password').live('click', function (event) {
+ $(this).children('img').click();
+ });
+
+ $('select.quota, select.quota-user').live('change', function () {
+ var select = $(this);
+ var uid = $(this).parent().parent().parent().attr('data-uid');
+ var quota = $(this).val();
+ var other = $(this).next();
+ if (quota != 'other') {
+ other.hide();
+ select.data('previous', quota);
+ setQuota(uid, quota);
+ } else {
+ other.show();
+ select.addClass('active');
+ other.focus();
+ }
+ });
+ $('select.quota, select.quota-user').each(function (i, select) {
+ $(select).data('previous', $(select).val());
+ })
+
+ $('input.quota-other').live('change', function () {
+ var uid = $(this).parent().parent().parent().attr('data-uid');
+ var quota = $(this).val();
+ var select = $(this).prev();
+ var other = $(this);
+ if (quota) {
+ setQuota(uid, quota, function (quota) {
+ select.children().attr('selected', null);
+ var existingOption = select.children().filter(function (i, option) {
+ return ($(option).val() == quota);
+ });
+ if (existingOption.length) {
+ existingOption.attr('selected', 'selected');
+ } else {
+ var option = $('<option/>');
+ option.attr('selected', 'selected').attr('value', quota).text(quota);
+ select.children().last().before(option);
+ }
+ select.val(quota);
+ select.removeClass('active');
+ other.val(null);
+ other.hide();
+ });
+ } else {
+ var previous = select.data('previous');
+ select.children().attr('selected', null);
+ select.children().each(function (i, option) {
+ if ($(option).val() == previous) {
+ $(option).attr('selected', 'selected');
+ }
+ });
+ select.removeClass('active');
+ other.hide();
+ }
+ });
- $('tbody tr:last').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
- UserList.update();
- });
+ $('input.quota-other').live('blur', function () {
+ $(this).change();
+ })
- function setQuota(uid,quota,ready){
- $.post(
- OC.filePath('settings','ajax','setquota.php'),
- {username:uid,quota:quota},
- function(result){
- if(ready){
- ready(result.data.quota);
- }
- }
- );
- }
-
-
- $('select[multiple]').each(function(index,element){
- UserList.applyMultiplySelect($(element));
- });
-
- $('td.remove>a').live('click',function(event){
- var row = $(this).parent().parent();
- var uid = $(row).attr('data-uid');
- $(row).hide();
- // Call function for handling delete/undo
- UserList.do_delete(uid);
- });
-
- $('td.password>img').live('click',function(event){
- event.stopPropagation();
- var img=$(this);
- var uid=img.parent().parent().attr('data-uid');
- var input=$('<input type="password">');
- img.css('display','none');
- img.parent().children('span').replaceWith(input);
- input.focus();
- input.keypress(function(event) {
- if(event.keyCode == 13) {
- if($(this).val().length>0){
- $.post(
- OC.filePath('settings','ajax','changepassword.php'),
- {username:uid,password:$(this).val()},
- function(result){}
- );
- input.blur();
- }else{
- input.blur();
- }
- }
- });
- input.blur(function(){
- $(this).replaceWith($('<span>●●●●●●●</span>'));
- img.css('display','');
- });
- });
- $('td.password').live('click',function(event){
- $(this).children('img').click();
- });
-
- $('select.quota, select.quota-user').live('change',function(){
- var select=$(this);
- var uid=$(this).parent().parent().parent().attr('data-uid');
- var quota=$(this).val();
- var other=$(this).next();
- if(quota!='other'){
- other.hide();
- select.data('previous',quota);
- setQuota(uid,quota);
- }else{
- other.show();
- select.addClass('active');
- other.focus();
- }
- });
- $('select.quota, select.quota-user').each(function(i,select){
- $(select).data('previous',$(select).val());
- })
-
- $('input.quota-other').live('change',function(){
- var uid=$(this).parent().parent().parent().attr('data-uid');
- var quota=$(this).val();
- var select=$(this).prev();
- var other=$(this);
- if(quota){
- setQuota(uid,quota,function(quota){
- select.children().attr('selected',null);
- var existingOption=select.children().filter(function(i,option){
- return ($(option).val()==quota);
- });
- if(existingOption.length){
- existingOption.attr('selected','selected');
- }else{
- var option=$('<option/>');
- option.attr('selected','selected').attr('value',quota).text(quota);
- select.children().last().before(option);
- }
- select.val(quota);
- select.removeClass('active');
- other.val(null);
- other.hide();
- });
- }else{
- var previous=select.data('previous');
- select.children().attr('selected',null);
- select.children().each(function(i,option){
- if($(option).val()==previous){
- $(option).attr('selected','selected');
- }
- });
- select.removeClass('active');
- other.hide();
- }
- });
-
- $('input.quota-other').live('blur',function(){
- $(this).change();
- })
-
- $('#newuser').submit(function(event){
- event.preventDefault();
- var username=$('#newusername').val();
- var password=$('#newuserpassword').val();
- if($('#content table tbody tr').filterAttr('data-uid',username).length>0){
- OC.dialogs.alert('The username is already being used', 'Error creating user');
- return;
- }
- if($.trim(username) == '') {
- OC.dialogs.alert('A valid username must be provided', 'Error creating user');
- return false;
- }
- if($.trim(password) == '') {
- OC.dialogs.alert('A valid password must be provided', 'Error creating user');
- return false;
- }
- var groups=$('#newusergroups').prev().children('div').data('settings').checked;
- $('#newuser').get(0).reset();
- $.post(
- OC.filePath('settings','ajax','createuser.php'),
- {
- username:username,
- password:password,
- groups:groups,
- },
- function(result){
- if(result.status!='success'){
- OC.dialogs.alert(result.data.message, 'Error creating user');
- } else {
- UserList.add(username, result.data.groups, null, 'default', true);
- }
- }
- );
- });
- // Handle undo notifications
- $('#notification').hide();
- $('#notification .undo').live('click', function() {
- if($('#notification').data('deleteuser')) {
- $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
- UserList.deleteCanceled=true;
- }
- $('#notification').fadeOut();
- });
- UserList.useUndo=('onbeforeunload' in window)
- $(window).bind('beforeunload', function (){
- UserList.finishDelete(null);
- });
+ $('#newuser').submit(function (event) {
+ event.preventDefault();
+ var username = $('#newusername').val();
+ var password = $('#newuserpassword').val();
+ if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) {
+ OC.dialogs.alert(
+ t('settings', 'The username is already being used'),
+ t('settings', 'Error creating user'));
+ return;
+ }
+ if ($.trim(username) == '') {
+ OC.dialogs.alert(
+ t('settings', 'A valid username must be provided'),
+ t('settings', 'Error creating user'));
+ return false;
+ }
+ if ($.trim(password) == '') {
+ OC.dialogs.alert(
+ t('settings', 'A valid password must be provided'),
+ t('settings', 'Error creating user'));
+ return false;
+ }
+ var groups = $('#newusergroups').prev().children('div').data('settings').checked;
+ $('#newuser').get(0).reset();
+ $.post(
+ OC.filePath('settings', 'ajax', 'createuser.php'),
+ {
+ username:username,
+ password:password,
+ groups:groups,
+ },
+ function (result) {
+ if (result.status != 'success') {
+ OC.dialogs.alert(result.data.message,
+ t('settings', 'Error creating user'));
+ } else {
+ UserList.add(username, result.data.groups, null, 'default', true);
+ }
+ }
+ );
+ });
+ // Handle undo notifications
+ $('#notification').hide();
+ $('#notification .undo').live('click', function () {
+ if ($('#notification').data('deleteuser')) {
+ $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
+ UserList.deleteCanceled = true;
+ }
+ $('#notification').fadeOut();
+ });
+ UserList.useUndo = ('onbeforeunload' in window)
+ $(window).bind('beforeunload', function () {
+ UserList.finishDelete(null);
+ });
});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 662e69bbfc5..730db722111 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,17 +1,41 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "فشل تحميل القائمة من الآب ستور",
+"Group already exists" => "المجموعة موجودة مسبقاً",
+"Unable to add group" => "فشل إضافة المجموعة",
+"Could not enable app. " => "فشل عملية تفعيل التطبيق",
+"Email saved" => "تم حفظ البريد الإلكتروني",
+"Invalid email" => "البريد الإلكتروني غير صالح",
"OpenID Changed" => "تم تغيير ال OpenID",
"Invalid request" => "طلبك غير مفهوم",
+"Unable to delete group" => "فشل إزالة المجموعة",
"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
+"Unable to delete user" => "فشل إزالة المستخدم",
"Language changed" => "تم تغيير اللغة",
+"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",
+"Disable" => "إيقاف",
+"Enable" => "تفعيل",
"Saving..." => "حفظ",
"__language_name__" => "__language_name__",
+"Add your App" => "أضف تطبيقاتك",
+"More Apps" => "المزيد من التطبيقات",
"Select an App" => "إختر تطبيقاً",
-"Documentation" => "التوثيق",
-"Ask a question" => "إسأل سؤال",
-"Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
-"Go there manually." => "إذهب هنالك بنفسك",
-"Answer" => "الجواب",
-"Download" => "انزال",
+"See application page at apps.owncloud.com" => "راجع صفحة التطبيق على apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>",
+"User Documentation" => "كتاب توثيق المستخدم",
+"Administrator Documentation" => "كتاب توثيق المدير",
+"Online Documentation" => "توثيق متوفر على الشبكة",
+"Forum" => "منتدى",
+"Bugtracker" => "تعقب علة",
+"Commercial Support" => "دعم تجاري",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
+"Clients" => "الزبائن",
+"Download Desktop Clients" => "تحميل عملاء سطح المكتب",
+"Download Android Client" => "تحميل عميل آندرويد",
+"Download iOS Client" => "تحميل عميل آي أو أس",
+"Password" => "كلمات السر",
+"Your password was changed" => "لقد تم تغيير كلمة السر",
"Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
"Current password" => "كلمات السر الحالية",
"New password" => "كلمات سر جديدة",
@@ -22,12 +46,16 @@
"Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور",
"Language" => "اللغة",
"Help translate" => "ساعد في الترجمه",
-"use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال ب ownCloud داخل نظام الملفات ",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات",
+"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\">رخصة أفيرو العمومية</abbr></a>.",
"Name" => "الاسم",
-"Password" => "كلمات السر",
"Groups" => "مجموعات",
"Create" => "انشئ",
+"Default Quota" => "الحصة النسبية الإفتراضية",
"Other" => "شيء آخر",
+"Group Admin" => "مدير المجموعة",
"Quota" => "حصه",
"Delete" => "حذف"
);
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 5a2d882581f..18784fae7b0 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -9,12 +9,8 @@
"Enable" => "Включване",
"Saving..." => "Записване...",
"Select an App" => "Изберете програма",
-"Documentation" => "Документация",
-"Ask a question" => "Задайте въпрос",
-"Problems connecting to help database." => "Проблеми при свързване с помощната база",
-"Go there manually." => "Отидете ръчно.",
-"Answer" => "Отговор",
-"Download" => "Изтегляне",
+"Clients" => "Клиенти",
+"Password" => "Парола",
"Unable to change your password" => "Невъзможна промяна на паролата",
"Current password" => "Текуща парола",
"New password" => "Нова парола",
@@ -25,9 +21,7 @@
"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
"Language" => "Език",
"Help translate" => "Помощ за превода",
-"use this address to connect to your ownCloud in your file manager" => "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър",
"Name" => "Име",
-"Password" => "Парола",
"Groups" => "Групи",
"Create" => "Ново",
"Default Quota" => "Квота по подразбиране",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index eff84e12de7..0f57387355a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -23,15 +23,18 @@
"Select an App" => "Seleccioneu una aplicació",
"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
-"Documentation" => "Documentació",
-"Managing Big Files" => "Gestió de fitxers grans",
-"Ask a question" => "Feu una pregunta",
-"Problems connecting to help database." => "Problemes per connectar amb la base de dades d'ajuda.",
-"Go there manually." => "Vés-hi manualment.",
-"Answer" => "Resposta",
+"User Documentation" => "Documentació d'usuari",
+"Administrator Documentation" => "Documentació d'administrador",
+"Online Documentation" => "Documentació en línia",
+"Forum" => "Fòrum",
+"Bugtracker" => "Seguiment d'errors",
+"Commercial Support" => "Suport comercial",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Clients de sincronització d'escriptori i de mòbil",
-"Download" => "Baixada",
+"Clients" => "Clients",
+"Download Desktop Clients" => "Baixa clients d'escriptori",
+"Download Android Client" => " Baixa el client per Android",
+"Download iOS Client" => "Baixa el client per iOS",
+"Password" => "Contrasenya",
"Your password was changed" => "La seva contrasenya s'ha canviat",
"Unable to change your password" => "No s'ha pogut canviar la contrasenya",
"Current password" => "Contrasenya actual",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
"Language" => "Idioma",
"Help translate" => "Ajudeu-nos amb la traducció",
-"use this address to connect to your ownCloud in your file manager" => "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
+"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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nom",
-"Password" => "Contrasenya",
"Groups" => "Grups",
"Create" => "Crea",
"Default Quota" => "Quota per defecte",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index ee30583b046..c88959026da 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -23,15 +23,18 @@
"Select an App" => "Vyberte aplikaci",
"See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
-"Documentation" => "Dokumentace",
-"Managing Big Files" => "Správa velkých souborů",
-"Ask a question" => "Zeptat se",
-"Problems connecting to help database." => "Problémy s připojením k databázi s nápovědou.",
-"Go there manually." => "Přejít ručně.",
-"Answer" => "Odpověď",
+"User Documentation" => "Uživatelská dokumentace",
+"Administrator Documentation" => "Dokumentace správce",
+"Online Documentation" => "Online dokumentace",
+"Forum" => "Fórum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Placená podpora",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
-"Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci",
-"Download" => "Stáhnout",
+"Clients" => "Klienti",
+"Download Desktop Clients" => "Stáhnout klienty pro počítač",
+"Download Android Client" => "Stáhnout klienta pro android",
+"Download iOS Client" => "Stáhnout klienta pro iOS",
+"Password" => "Heslo",
"Your password was changed" => "Vaše heslo bylo změněno",
"Unable to change your password" => "Vaše heslo nelze změnit",
"Current password" => "Současné heslo",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte adresu e-mailu",
"Language" => "Jazyk",
"Help translate" => "Pomoci s překladem",
-"use this address to connect to your ownCloud in your file manager" => "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
+"Version" => "Verze",
"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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Jméno",
-"Password" => "Heslo",
"Groups" => "Skupiny",
"Create" => "Vytvořit",
"Default Quota" => "Výchozí kvóta",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 3d82f6e4a0b..d8b36266e24 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -11,6 +11,7 @@
"Authentication error" => "Adgangsfejl",
"Unable to delete user" => "Bruger kan ikke slettes",
"Language changed" => "Sprog ændret",
+"Admins can't remove themself from the admin group" => "Administratorer kan ikke fjerne dem selv fra admin gruppen",
"Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
"Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
"Disable" => "Deaktiver",
@@ -22,14 +23,18 @@
"Select an App" => "Vælg en App",
"See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Håndter store filer",
-"Ask a question" => "Stil et spørgsmål",
-"Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
-"Go there manually." => "Gå derhen manuelt.",
-"Answer" => "Svar",
-"Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil",
-"Download" => "Download",
+"User Documentation" => "Brugerdokumentation",
+"Administrator Documentation" => "Administrator Dokumentation",
+"Online Documentation" => "Online dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerciel support",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
+"Clients" => "Klienter",
+"Download Desktop Clients" => "Hent Desktop Klienter",
+"Download Android Client" => "Hent Android Klient",
+"Download iOS Client" => "Hent iOS Klient",
+"Password" => "Kodeord",
"Your password was changed" => "Din adgangskode blev ændret",
"Unable to change your password" => "Ude af stand til at ændre dit kodeord",
"Current password" => "Nuværende adgangskode",
@@ -41,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
"Language" => "Sprog",
"Help translate" => "Hjælp med oversættelsen",
-"use this address to connect to your ownCloud in your file manager" => "benyt denne adresse til at forbinde til din ownCloud i din filbrowser",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
+"Version" => "Version",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Navn",
-"Password" => "Kodeord",
"Groups" => "Grupper",
"Create" => "Ny",
"Default Quota" => "Standard kvote",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 33de45a9225..e27d1c1c432 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -23,15 +23,18 @@
"Select an App" => "Wähle eine Anwendung aus",
"See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stelle eine Frage",
-"Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
-"Go there manually." => "Datenbank direkt besuchen.",
-"Answer" => "Antwort",
+"User Documentation" => "Dokumentation für Benutzer",
+"Administrator Documentation" => "Dokumentation für Administratoren",
+"Online Documentation" => "Online-Dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerzieller Support",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
-"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
-"Download" => "Download",
+"Clients" => "Kunden",
+"Download Desktop Clients" => "Desktop-Client herunterladen",
+"Download Android Client" => "Android-Client herunterladen",
+"Download iOS Client" => "iOS-Client herunterladen",
+"Password" => "Passwort",
"Your password was changed" => "Dein Passwort wurde geändert.",
"Unable to change your password" => "Passwort konnte nicht geändert werden",
"Current password" => "Aktuelles Passwort",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
"Language" => "Sprache",
"Help translate" => "Hilf bei der Übersetzung",
-"use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deine ownCloud mit Deinem Dateimanager zu verbinden.",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
+"Version" => "Version",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
"Name" => "Name",
-"Password" => "Passwort",
"Groups" => "Gruppen",
"Create" => "Anlegen",
"Default Quota" => "Standard-Quota",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 9db7cb93c36..99d7c1360ce 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -23,15 +23,18 @@
"Select an App" => "Wählen Sie eine Anwendung aus",
"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stellen Sie eine Frage",
-"Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
-"Go there manually." => "Datenbank direkt besuchen.",
-"Answer" => "Antwort",
+"User Documentation" => "Dokumentation für Benutzer",
+"Administrator Documentation" => "Dokumentation für Administratoren",
+"Online Documentation" => "Online-Dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerzieller Support",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
-"Download" => "Download",
+"Clients" => "Kunden",
+"Download Desktop Clients" => "Desktop-Client herunterladen",
+"Download Android Client" => "Android-Client herunterladen",
+"Download iOS Client" => "iOS-Client herunterladen",
+"Password" => "Passwort",
"Your password was changed" => "Ihr Passwort wurde geändert.",
"Unable to change your password" => "Das Passwort konnte nicht geändert werden",
"Current password" => "Aktuelles Passwort",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
"Language" => "Sprache",
"Help translate" => "Helfen Sie bei der Übersetzung",
-"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
"Name" => "Name",
-"Password" => "Passwort",
"Groups" => "Gruppen",
"Create" => "Anlegen",
"Default Quota" => "Standard-Quota",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index ac62453886c..38b96151cb4 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -23,15 +23,18 @@
"Select an App" => "Επιλέξτε μια Εφαρμογή",
"See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>",
-"Documentation" => "Τεκμηρίωση",
-"Managing Big Files" => "Διαχείριση Μεγάλων Αρχείων",
-"Ask a question" => "Ρωτήστε μια ερώτηση",
-"Problems connecting to help database." => "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας.",
-"Go there manually." => "Χειροκίνητη μετάβαση.",
-"Answer" => "Απάντηση",
+"User Documentation" => "Τεκμηρίωση Χρήστη",
+"Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
+"Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
+"Forum" => "Φόρουμ",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Εμπορική Υποστήριξη",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Πελάτες συγχρονισμού για Desktop και Mobile",
-"Download" => "Λήψη",
+"Clients" => "Πελάτες",
+"Download Desktop Clients" => "Λήψη Προγραμμάτων για Σταθερούς Υπολογιστές",
+"Download Android Client" => "Λήψη Προγράμματος Android",
+"Download iOS Client" => "Λήψη Προγράμματος iOS",
+"Password" => "Συνθηματικό",
"Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
"Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
"Current password" => "Τρέχων συνθηματικό",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
"Language" => "Γλώσσα",
"Help translate" => "Βοηθήστε στη μετάφραση",
-"use this address to connect to your ownCloud in your file manager" => "χρησιμοποιήστε αυτήν τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
+"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>.",
"Name" => "Όνομα",
-"Password" => "Συνθηματικό",
"Groups" => "Ομάδες",
"Create" => "Δημιουργία",
"Default Quota" => "Προεπιλεγμένο Όριο",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index e686868e67c..668d48f30b3 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -23,15 +23,9 @@
"Select an App" => "Elekti aplikaĵon",
"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
-"Documentation" => "Dokumentaro",
-"Managing Big Files" => "Administrante grandajn dosierojn",
-"Ask a question" => "Faru demandon",
-"Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
-"Go there manually." => "Iri tien mane.",
-"Answer" => "Respondi",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Labortablaj kaj porteblaj sinkronigoklientoj",
-"Download" => "Elŝuti",
+"Clients" => "Klientoj",
+"Password" => "Pasvorto",
"Your password was changed" => "Via pasvorto ŝanĝiĝis",
"Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
"Current password" => "Nuna pasvorto",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron",
"Language" => "Lingvo",
"Help translate" => "Helpu traduki",
-"use this address to connect to your ownCloud in your file manager" => "uzu ĉi tiun adreson por konektiĝi al via ownCloud per via dosieradministrilo",
"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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nomo",
-"Password" => "Pasvorto",
"Groups" => "Grupoj",
"Create" => "Krei",
"Default Quota" => "Defaŭlta kvoto",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 39f88ac4ea2..2f7a639ee00 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -23,15 +23,9 @@
"Select an App" => "Seleccionar una aplicación",
"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"Documentation" => "Documentación",
-"Managing Big Files" => "Administra archivos grandes",
-"Ask a question" => "Hacer una pregunta",
-"Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
-"Go there manually." => "Ir manualmente",
-"Answer" => "Respuesta",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronización móviles y de escritorio",
-"Download" => "Descargar",
+"Clients" => "Clientes",
+"Password" => "Contraseña",
"Your password was changed" => "Su contraseña ha sido cambiada",
"Unable to change your password" => "No se ha podido cambiar tu contraseña",
"Current password" => "Contraseña actual",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Escribe una dirección de correo electrónico para restablecer la contraseña",
"Language" => "Idioma",
"Help translate" => "Ayúdanos a traducir",
-"use this address to connect to your ownCloud in your file manager" => "utiliza esta dirección para conectar a tu ownCloud desde tu gestor de archivos",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nombre",
-"Password" => "Contraseña",
"Groups" => "Grupos",
"Create" => "Crear",
"Default Quota" => "Cuota predeterminada",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index ebbce841a8e..b408405d6da 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -23,15 +23,9 @@
"Select an App" => "Seleccionar una aplicación",
"See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
-"Documentation" => "Documentación",
-"Managing Big Files" => "Administrar archivos grandes",
-"Ask a question" => "Hacer una pregunta",
-"Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
-"Go there manually." => "Ir de forma manual",
-"Answer" => "Respuesta",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronización para celulares, tablets y de escritorio",
-"Download" => "Descargar",
+"Clients" => "Clientes",
+"Password" => "Contraseña",
"Your password was changed" => "Tu contraseña fue cambiada",
"Unable to change your password" => "No fue posible cambiar tu contraseña",
"Current password" => "Contraseña actual",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
"Language" => "Idioma",
"Help translate" => "Ayudanos a traducir",
-"use this address to connect to your ownCloud in your file manager" => "usá esta dirección para conectarte a tu ownCloud desde tu gestor de archivos",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nombre",
-"Password" => "Contraseña",
"Groups" => "Grupos",
"Create" => "Crear",
"Default Quota" => "Cuota predeterminada",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 17fd60b9490..7b61ee92eb0 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -22,14 +22,8 @@
"Select an App" => "Vali programm",
"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
-"Documentation" => "Dokumentatsioon",
-"Managing Big Files" => "Suurte failide haldamine",
-"Ask a question" => "Küsi küsimus",
-"Problems connecting to help database." => "Probleemid abiinfo andmebaasiga ühendumisel.",
-"Go there manually." => "Mine sinna käsitsi.",
-"Answer" => "Vasta",
-"Desktop and Mobile Syncing Clients" => "Töölaua ja mobiiliga sünkroniseerimise rakendused",
-"Download" => "Lae alla",
+"Clients" => "Kliendid",
+"Password" => "Parool",
"Your password was changed" => "Sinu parooli on muudetud",
"Unable to change your password" => "Sa ei saa oma parooli muuta",
"Current password" => "Praegune parool",
@@ -41,9 +35,7 @@
"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
"Language" => "Keel",
"Help translate" => "Aita tõlkida",
-"use this address to connect to your ownCloud in your file manager" => "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga",
"Name" => "Nimi",
-"Password" => "Parool",
"Groups" => "Grupid",
"Create" => "Lisa",
"Default Quota" => "Vaikimisi kvoot",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 7d79c79ced3..ee85f723f69 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -23,15 +23,18 @@
"Select an App" => "Aukeratu programa bat",
"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
-"Documentation" => "Dokumentazioa",
-"Managing Big Files" => "Fitxategi handien kudeaketa",
-"Ask a question" => "Egin galdera bat",
-"Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
-"Go there manually." => "Joan hara eskuz.",
-"Answer" => "Erantzun",
+"User Documentation" => "Erabiltzaile dokumentazioa",
+"Administrator Documentation" => "Administradore dokumentazioa",
+"Online Documentation" => "Online dokumentazioa",
+"Forum" => "Foroa",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Babes komertziala",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
-"Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak",
-"Download" => "Deskargatu",
+"Clients" => "Bezeroak",
+"Download Desktop Clients" => "Deskargatu mahaigainerako bezeroak",
+"Download Android Client" => "Deskargatu Android bezeroa",
+"Download iOS Client" => "Deskargatu iOS bezeroa",
+"Password" => "Pasahitza",
"Your password was changed" => "Zere pasahitza aldatu da",
"Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
"Current password" => "Uneko pasahitza",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
"Language" => "Hizkuntza",
"Help translate" => "Lagundu itzultzen",
-"use this address to connect to your ownCloud in your file manager" => "erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
+"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>.",
"Name" => "Izena",
-"Password" => "Pasahitza",
"Groups" => "Taldeak",
"Create" => "Sortu",
"Default Quota" => "Kuota lehentsia",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 3dcb770c730..764bef6dc8b 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -13,14 +13,8 @@
"Add your App" => "برنامه خود را بیافزایید",
"Select an App" => "یک برنامه انتخاب کنید",
"See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
-"Documentation" => "مستندات",
-"Managing Big Files" => "مدیریت پرونده های بزرگ",
-"Ask a question" => "یک سوال بپرسید",
-"Problems connecting to help database." => "مشکلاتی برای وصل شدن به پایگاه داده کمکی",
-"Go there manually." => "بروید آنجا به صورت دستی",
-"Answer" => "پاسخ",
-"Desktop and Mobile Syncing Clients" => " ابزار مدیریت با دسکتاپ و موبایل",
-"Download" => "بارگیری",
+"Clients" => "مشتریان",
+"Password" => "گذرواژه",
"Your password was changed" => "رمز عبور شما تغییر یافت",
"Unable to change your password" => "ناتوان در تغییر گذرواژه",
"Current password" => "گذرواژه کنونی",
@@ -32,9 +26,7 @@
"Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود",
"Language" => "زبان",
"Help translate" => "به ترجمه آن کمک کنید",
-"use this address to connect to your ownCloud in your file manager" => "از این نشانی برای وصل شدن به ابرهایتان در مدیرپرونده استفاده کنید",
"Name" => "نام",
-"Password" => "گذرواژه",
"Groups" => "گروه ها",
"Create" => "ایجاد کردن",
"Default Quota" => "سهم پیش فرض",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index d68ed8ebaae..2d9d6ce941c 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -23,15 +23,18 @@
"Select an App" => "Valitse sovellus",
"See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
-"Documentation" => "Dokumentaatio",
-"Managing Big Files" => "Suurten tiedostojen hallinta",
-"Ask a question" => "Kysy jotain",
-"Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.",
-"Go there manually." => "Siirry sinne itse.",
-"Answer" => "Vastaus",
+"User Documentation" => "Käyttäjäohjeistus",
+"Administrator Documentation" => "Ylläpito-ohjeistus",
+"Online Documentation" => "Verkko-ohjeistus",
+"Forum" => "Keskustelupalsta",
+"Bugtracker" => "Ohjelmistovirheiden jäljitys",
+"Commercial Support" => "Kaupallinen tuki",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
-"Download" => "Lataa",
+"Clients" => "Asiakkaat",
+"Download Desktop Clients" => "Lataa työpöytäsovelluksia",
+"Download Android Client" => "Lataa Android-sovellus",
+"Download iOS Client" => "Lataa iOS-sovellus",
+"Password" => "Salasana",
"Your password was changed" => "Salasanasi vaihdettiin",
"Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
"Current password" => "Nykyinen salasana",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
"Language" => "Kieli",
"Help translate" => "Auta kääntämisessä",
-"use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen",
+"Version" => "Versio",
"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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
"Name" => "Nimi",
-"Password" => "Salasana",
"Groups" => "Ryhmät",
"Create" => "Luo",
"Default Quota" => "Oletuskiintiö",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 8e5169fe0f3..b4b3d46e05f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -23,15 +23,18 @@
"Select an App" => "Sélectionner une Application",
"See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
-"Documentation" => "Documentation",
-"Managing Big Files" => "Gérer les gros fichiers",
-"Ask a question" => "Poser une question",
-"Problems connecting to help database." => "Problème de connexion à la base de données d'aide.",
-"Go there manually." => "S'y rendre manuellement.",
-"Answer" => "Réponse",
+"User Documentation" => "Documentation utilisateur",
+"Administrator Documentation" => "Documentation administrateur",
+"Online Documentation" => "Documentation en ligne",
+"Forum" => "Forum",
+"Bugtracker" => "Suivi de bugs",
+"Commercial Support" => "Support commercial",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
-"Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
-"Download" => "Télécharger",
+"Clients" => "Clients",
+"Download Desktop Clients" => "Télécharger des clients de bureau",
+"Download Android Client" => "Télécharger le client Android",
+"Download iOS Client" => "Télécharger le client iOS",
+"Password" => "Mot de passe",
"Your password was changed" => "Votre mot de passe a été changé",
"Unable to change your password" => "Impossible de changer votre mot de passe",
"Current password" => "Mot de passe actuel",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
"Language" => "Langue",
"Help translate" => "Aidez à traduire",
-"use this address to connect to your ownCloud in your file manager" => "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
+"Version" => "Version",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nom",
-"Password" => "Mot de passe",
"Groups" => "Groupes",
"Create" => "Créer",
"Default Quota" => "Quota par défaut",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 1cde895d0d9..b322c6f8bcf 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -23,15 +23,9 @@
"Select an App" => "Escolla un Aplicativo",
"See application page at apps.owncloud.com" => "Vexa a páxina do aplicativo en apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
-"Documentation" => "Documentación",
-"Managing Big Files" => "Xestionar Grandes Ficheiros",
-"Ask a question" => "Pregunte",
-"Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
-"Go there manually." => "Ir manualmente.",
-"Answer" => "Resposta",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Tes usados <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Cliente de sincronización de escritorio e móbil",
-"Download" => "Descargar",
+"Clients" => "Clientes",
+"Password" => "Contrasinal",
"Your password was changed" => "O seu contrasinal foi cambiado",
"Unable to change your password" => "Incapaz de trocar o seu contrasinal",
"Current password" => "Contrasinal actual",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo electrónico para habilitar a recuperación do contrasinal",
"Language" => "Idioma",
"Help translate" => "Axude na tradución",
-"use this address to connect to your ownCloud in your file manager" => "utilice este enderezo para conectar ao seu ownCloud no xestor de ficheiros",
"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>.",
"Name" => "Nome",
-"Password" => "Contrasinal",
"Groups" => "Grupos",
"Create" => "Crear",
"Default Quota" => "Cota por omisión",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index f82cc83d9f7..ce9e61be291 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -23,15 +23,17 @@
"Select an App" => "בחירת יישום",
"See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>",
-"Documentation" => "תיעוד",
-"Managing Big Files" => "ניהול קבצים גדולים",
-"Ask a question" => "שאל שאלה",
-"Problems connecting to help database." => "בעיות בהתחברות לבסיס נתוני העזרה",
-"Go there manually." => "גש לשם באופן ידני",
-"Answer" => "מענה",
+"User Documentation" => "תיעוד משתמש",
+"Administrator Documentation" => "תיעוד מנהלים",
+"Online Documentation" => "תיעוד מקוון",
+"Forum" => "פורום",
+"Commercial Support" => "תמיכה בתשלום",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
-"Desktop and Mobile Syncing Clients" => "לקוחות סנכרון למחשב שולחני ולנייד",
-"Download" => "הורדה",
+"Clients" => "לקוחות",
+"Download Desktop Clients" => "הורד לתוכנה למחשב",
+"Download Android Client" => "הורד תוכנה לאנדרואיד",
+"Download iOS Client" => "הורד תוכנה לiOS",
+"Password" => "ססמה",
"Your password was changed" => "הססמה שלך הוחלפה",
"Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
"Current password" => "ססמה נוכחית",
@@ -43,10 +45,10 @@
"Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
"Language" => "פה",
"Help translate" => "עזרה בתרגום",
-"use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים",
+"Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
+"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>.",
"Name" => "שם",
-"Password" => "ססמה",
"Groups" => "קבוצות",
"Create" => "יצירה",
"Default Quota" => "מכסת בררת המחדל",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 645b991a912..034ededf5f9 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,4 +1,4 @@
<?php $TRANSLATIONS = array(
-"New password" => "नया पासवर्ड",
-"Password" => "पासवर्ड"
+"Password" => "पासवर्ड",
+"New password" => "नया पासवर्ड"
);
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 7f2fefb90d5..437afeb7f59 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -13,14 +13,8 @@
"Add your App" => "Dodajte vašu aplikaciju",
"Select an App" => "Odaberite Aplikaciju",
"See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
-"Documentation" => "dokumentacija",
-"Managing Big Files" => "Upravljanje velikih datoteka",
-"Ask a question" => "Postavite pitanje",
-"Problems connecting to help database." => "Problem pri spajanju na bazu podataka pomoći",
-"Go there manually." => "Idite tamo ručno.",
-"Answer" => "Odgovor",
-"Desktop and Mobile Syncing Clients" => "Desktop i Mobile sinkronizaciji klijenti",
-"Download" => "preuzimanje",
+"Clients" => "Klijenti",
+"Password" => "Lozinka",
"Unable to change your password" => "Nemoguće promijeniti lozinku",
"Current password" => "Trenutna lozinka",
"New password" => "Nova lozinka",
@@ -31,9 +25,7 @@
"Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
"Language" => "Jezik",
"Help translate" => "Pomoć prevesti",
-"use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka",
"Name" => "Ime",
-"Password" => "Lozinka",
"Groups" => "Grupe",
"Create" => "Izradi",
"Default Quota" => "standardni kvota",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index e587f7107ae..18f21129b85 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -13,14 +13,8 @@
"Add your App" => "App hozzáadása",
"Select an App" => "Egy App kiválasztása",
"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
-"Documentation" => "Dokumentáció",
-"Managing Big Files" => "Nagy fájlok kezelése",
-"Ask a question" => "Tégy fel egy kérdést",
-"Problems connecting to help database." => "Sikertelen csatlakozás a Súgó adatbázishoz",
-"Go there manually." => "Menj oda kézzel",
-"Answer" => "Válasz",
-"Desktop and Mobile Syncing Clients" => "Asztali- és mobilkliensek kezelése",
-"Download" => "Letöltés",
+"Clients" => "Kliensek",
+"Password" => "Jelszó",
"Unable to change your password" => "Nem lehet megváltoztatni a jelszavad",
"Current password" => "Jelenlegi jelszó",
"New password" => "Új jelszó",
@@ -31,9 +25,7 @@
"Fill in an email address to enable password recovery" => "Töltsd ki az email címet, hogy engedélyezhesd a jelszó-visszaállítást",
"Language" => "Nyelv",
"Help translate" => "Segíts lefordítani!",
-"use this address to connect to your ownCloud in your file manager" => "Használd ezt a címet hogy csatlakozz a saját ownCloud rendszeredhez a fájlkezelődben",
"Name" => "Név",
-"Password" => "Jelszó",
"Groups" => "Csoportok",
"Create" => "Létrehozás",
"Default Quota" => "Alapértelmezett kvóta",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index c5f4e7eaf24..f2053b95279 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -5,10 +5,8 @@
"__language_name__" => "Interlingua",
"Add your App" => "Adder tu application",
"Select an App" => "Selectionar un app",
-"Documentation" => "Documentation",
-"Ask a question" => "Facer un question",
-"Answer" => "Responsa",
-"Download" => "Discargar",
+"Clients" => "Clientes",
+"Password" => "Contrasigno",
"Unable to change your password" => "Non pote cambiar tu contrasigno",
"Current password" => "Contrasigno currente",
"New password" => "Nove contrasigno",
@@ -18,9 +16,7 @@
"Your email address" => "Tu adresse de e-posta",
"Language" => "Linguage",
"Help translate" => "Adjuta a traducer",
-"use this address to connect to your ownCloud in your file manager" => "usa iste addresse pro connecter a tu ownCloud in tu administrator de files",
"Name" => "Nomine",
-"Password" => "Contrasigno",
"Groups" => "Gruppos",
"Create" => "Crear",
"Default Quota" => "Quota predeterminate",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index ad89a4659d0..fd2be4856d9 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -12,14 +12,8 @@
"Add your App" => "Tambahkan App anda",
"Select an App" => "Pilih satu aplikasi",
"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
-"Documentation" => "Dokumentasi",
-"Managing Big Files" => "Mengelola berkas besar",
-"Ask a question" => "Ajukan pertanyaan",
-"Problems connecting to help database." => "Bermasalah saat menghubungi database bantuan.",
-"Go there manually." => "Pergi kesana secara manual.",
-"Answer" => "Jawab",
-"Desktop and Mobile Syncing Clients" => "Klien sync Desktop dan Mobile",
-"Download" => "Unduh",
+"Clients" => "Klien",
+"Password" => "Password",
"Unable to change your password" => "Tidak dapat merubah password anda",
"Current password" => "Password saat ini",
"New password" => "kata kunci baru",
@@ -30,9 +24,7 @@
"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
"Language" => "Bahasa",
"Help translate" => "Bantu menerjemahkan",
-"use this address to connect to your ownCloud in your file manager" => "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda",
"Name" => "Nama",
-"Password" => "Password",
"Groups" => "Group",
"Create" => "Buat",
"Default Quota" => "Kuota default",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index fa24156b589..79551579fc2 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -23,15 +23,18 @@
"Select an App" => "Seleziona un'applicazione",
"See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
-"Documentation" => "Documentazione",
-"Managing Big Files" => "Gestione file grandi",
-"Ask a question" => "Fai una domanda",
-"Problems connecting to help database." => "Problemi di connessione al database di supporto.",
-"Go there manually." => "Raggiungilo manualmente.",
-"Answer" => "Risposta",
+"User Documentation" => "Documentazione utente",
+"Administrator Documentation" => "Documentazione amministratore",
+"Online Documentation" => "Documentazione in linea",
+"Forum" => "Forum",
+"Bugtracker" => "Sistema di tracciamento bug",
+"Commercial Support" => "Supporto commerciale",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
-"Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
-"Download" => "Scaricamento",
+"Clients" => "Client",
+"Download Desktop Clients" => "Scarica client desktop",
+"Download Android Client" => "Scarica client Android",
+"Download iOS Client" => "Scarica client iOS",
+"Password" => "Password",
"Your password was changed" => "La tua password è cambiata",
"Unable to change your password" => "Modifica password non riuscita",
"Current password" => "Password attuale",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
"Language" => "Lingua",
"Help translate" => "Migliora la traduzione",
-"use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
+"Version" => "Versione",
"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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nome",
-"Password" => "Password",
"Groups" => "Gruppi",
"Create" => "Crea",
"Default Quota" => "Quota predefinita",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 098cce843d7..847f696037d 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -23,15 +23,18 @@
"Select an App" => "アプリを選択してください",
"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
-"Documentation" => "ドキュメント",
-"Managing Big Files" => "大きなファイルを扱うには",
-"Ask a question" => "質問してください",
-"Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
-"Go there manually." => "手動で移動してください。",
-"Answer" => "解答",
+"User Documentation" => "ユーザドキュメント",
+"Administrator Documentation" => "管理者ドキュメント",
+"Online Documentation" => "オンラインドキュメント",
+"Forum" => "フォーラム",
+"Bugtracker" => "バグトラッカー",
+"Commercial Support" => "コマーシャルサポート",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
-"Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
-"Download" => "ダウンロード",
+"Clients" => "顧客",
+"Download Desktop Clients" => "デスクトップクライアントをダウンロード",
+"Download Android Client" => "Androidクライアントをダウンロード",
+"Download iOS Client" => "iOSクライアントをダウンロード",
+"Password" => "パスワード",
"Your password was changed" => "パスワードを変更しました",
"Unable to change your password" => "パスワードを変更することができません",
"Current password" => "現在のパスワード",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です",
"Language" => "言語",
"Help translate" => "翻訳に協力する",
-"use this address to connect to your ownCloud in your file manager" => "ファイルマネージャーであなたのownCloudに接続する際は、このアドレスを使用してください",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
+"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 community</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> ライセンスにより提供されています。",
"Name" => "名前",
-"Password" => "パスワード",
"Groups" => "グループ",
"Create" => "作成",
"Default Quota" => "デフォルトのクォータサイズ",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index d3ad88fe95f..26720b20619 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -22,14 +22,8 @@
"Select an App" => "აირჩიეთ აპლიკაცია",
"See application page at apps.owncloud.com" => "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>",
-"Documentation" => "დოკუმენტაცია",
-"Managing Big Files" => "დიდი ფაილების მენეჯმენტი",
-"Ask a question" => "დასვით შეკითხვა",
-"Problems connecting to help database." => "დახმარების ბაზასთან წვდომის პრობლემა",
-"Go there manually." => "წადი იქ შენით.",
-"Answer" => "პასუხი",
-"Desktop and Mobile Syncing Clients" => "დესკტოპ და მობილური კლიენტების სინქრონიზაცია",
-"Download" => "ჩამოტვირთვა",
+"Clients" => "კლიენტები",
+"Password" => "პაროლი",
"Your password was changed" => "თქვენი პაროლი შეიცვალა",
"Unable to change your password" => "თქვენი პაროლი არ შეიცვალა",
"Current password" => "მიმდინარე პაროლი",
@@ -41,9 +35,7 @@
"Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
"Language" => "ენა",
"Help translate" => "თარგმნის დახმარება",
-"use this address to connect to your ownCloud in your file manager" => "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში",
"Name" => "სახელი",
-"Password" => "პაროლი",
"Groups" => "ჯგუფი",
"Create" => "შექმნა",
"Default Quota" => "საწყისი ქვოტა",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 7e9ba19a8fd..286cac87c53 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -23,15 +23,9 @@
"Select an App" => "앱 선택",
"See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스 보유자 <span class=\"author\"></span>",
-"Documentation" => "문서",
-"Managing Big Files" => "큰 파일 관리",
-"Ask a question" => "질문하기",
-"Problems connecting to help database." => "데이터베이스에 연결하는 데 문제가 발생하였습니다.",
-"Go there manually." => "직접 갈 수 있습니다.",
-"Answer" => "대답",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
-"Desktop and Mobile Syncing Clients" => "데스크톱 및 모바일 동기화 클라이언트",
-"Download" => "다운로드",
+"Clients" => "고객",
+"Password" => "암호",
"Your password was changed" => "암호가 변경되었습니다",
"Unable to change your password" => "암호를 변경할 수 없음",
"Current password" => "현재 암호",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오.",
"Language" => "언어",
"Help translate" => "번역 돕기",
-"use this address to connect to your ownCloud in your file manager" => "파일 관리자에서 내 ownCloud에 연결할 때 이 주소를 사용하십시오",
"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>에 따라 사용이 허가됩니다.",
"Name" => "이름",
-"Password" => "암호",
"Groups" => "그룹",
"Create" => "만들기",
"Default Quota" => "기본 할당량",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index b4bdf2a6ced..6a4996e8252 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,10 +1,8 @@
<?php $TRANSLATIONS = array(
"Enable" => "چالاککردن",
"Saving..." => "پاشکه‌وتده‌کات...",
-"Documentation" => "به‌ڵگه‌نامه",
-"Download" => "داگرتن",
+"Password" => "وشەی تێپەربو",
"New password" => "وشەی نهێنی نوێ",
"Email" => "ئیمه‌یل",
-"Name" => "ناو",
-"Password" => "وشەی تێپەربو"
+"Name" => "ناو"
);
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 440b81d44c9..baa89a033b6 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -13,14 +13,8 @@
"Add your App" => "Setz deng App bei",
"Select an App" => "Wiel eng Applikatioun aus",
"See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
-"Documentation" => "Dokumentatioun",
-"Managing Big Files" => "Grouss Fichieren verwalten",
-"Ask a question" => "Stell eng Fro",
-"Problems connecting to help database." => "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen.",
-"Go there manually." => "Gei manuell dohinner.",
-"Answer" => "Äntwert",
-"Desktop and Mobile Syncing Clients" => "Desktop an Mobile Syncing Clienten",
-"Download" => "Download",
+"Clients" => "Clienten",
+"Password" => "Passwuert",
"Unable to change your password" => "Konnt däin Passwuert net änneren",
"Current password" => "Momentan 't Passwuert",
"New password" => "Neit Passwuert",
@@ -31,9 +25,7 @@
"Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
"Language" => "Sprooch",
"Help translate" => "Hëllef iwwersetzen",
-"use this address to connect to your ownCloud in your file manager" => "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen",
"Name" => "Numm",
-"Password" => "Passwuert",
"Groups" => "Gruppen",
"Create" => "Erstellen",
"Default Quota" => "Standard Quota",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 6399b5b1b49..f5fa8e29d96 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -15,11 +15,8 @@
"More Apps" => "Daugiau aplikacijų",
"Select an App" => "Pasirinkite programą",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
-"Documentation" => "Dokumentacija",
-"Ask a question" => "Užduoti klausimą",
-"Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
-"Answer" => "Atsakyti",
-"Download" => "Atsisiųsti",
+"Clients" => "Klientai",
+"Password" => "Slaptažodis",
"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
"Current password" => "Dabartinis slaptažodis",
@@ -31,9 +28,7 @@
"Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
"Language" => "Kalba",
"Help translate" => "Padėkite išversti",
-"use this address to connect to your ownCloud in your file manager" => "naudokite šį adresą, jei norite pasiekti savo ownCloud per failų tvarkyklę",
"Name" => "Vardas",
-"Password" => "Slaptažodis",
"Groups" => "Grupės",
"Create" => "Sukurti",
"Default Quota" => "Numatytoji kvota",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 13f4483f1d2..3f45d669b59 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -22,15 +22,8 @@
"Select an App" => "Izvēlies aplikāciju",
"See application page at apps.owncloud.com" => "Apskatie aplikāciju lapu - apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
-"Documentation" => "Dokumentācija",
-"Managing Big Files" => "Rīkoties ar apjomīgiem failiem",
-"Ask a question" => "Uzdod jautajumu",
-"Problems connecting to help database." => "Problēmas ar datubāzes savienojumu",
-"Go there manually." => "Nokļūt tur pašrocīgi",
-"Answer" => "Atbildēt",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Desktop un mobīlo ierīču sinhronizācijas rīks",
-"Download" => "Lejuplādēt",
+"Password" => "Parole",
"Your password was changed" => "Jūru parole tika nomainīta",
"Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
"Current password" => "Pašreizējā parole",
@@ -42,10 +35,8 @@
"Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība",
"Language" => "Valoda",
"Help translate" => "Palīdzi tulkot",
-"use this address to connect to your ownCloud in your file manager" => "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka",
"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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Vārds",
-"Password" => "Parole",
"Groups" => "Grupas",
"Create" => "Izveidot",
"Default Quota" => "Apjoms pēc noklusējuma",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 8594825fdd6..25a3fa80c47 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,24 +1,40 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
+"Group already exists" => "Групата веќе постои",
+"Unable to add group" => "Неможе да додадам група",
+"Could not enable app. " => "Неможе да овозможам апликација.",
"Email saved" => "Електронската пошта е снимена",
"Invalid email" => "Неисправна електронска пошта",
"OpenID Changed" => "OpenID сменето",
"Invalid request" => "неправилно барање",
+"Unable to delete group" => "Неможе да избришам група",
+"Authentication error" => "Грешка во автентикација",
+"Unable to delete user" => "Неможам да избришам корисник",
"Language changed" => "Јазикот е сменет",
+"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",
"Disable" => "Оневозможи",
"Enable" => "Овозможи",
"Saving..." => "Снимам...",
"__language_name__" => "__language_name__",
"Add your App" => "Додадете ја Вашата апликација",
+"More Apps" => "Повеќе аппликации",
"Select an App" => "Избери аппликација",
"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
-"Documentation" => "Документација",
-"Managing Big Files" => "Управување со големи датотеки",
-"Ask a question" => "Постави прашање",
-"Problems connecting to help database." => "Проблем при поврзување со базата за помош",
-"Go there manually." => "Оди таму рачно.",
-"Answer" => "Одговор",
-"Desktop and Mobile Syncing Clients" => "Десктоп и мобилник клиенти за синхронизирање",
-"Download" => "Преземање",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>",
+"User Documentation" => "Корисничка документација",
+"Administrator Documentation" => "Администраторска документација",
+"Online Documentation" => "Документација на интернет",
+"Forum" => "Форум",
+"Commercial Support" => "Комерцијална подршка",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
+"Clients" => "Клиенти",
+"Download Desktop Clients" => "Преземи клиенти за десктоп",
+"Download Android Client" => "Преземи клиент за Андроид",
+"Download iOS Client" => "Преземи iOS клиент",
+"Password" => "Лозинка",
+"Your password was changed" => "Вашата лозинка беше променета.",
"Unable to change your password" => "Вашата лозинка неможе да се смени",
"Current password" => "Моментална лозинка",
"New password" => "Нова лозинка",
@@ -29,13 +45,16 @@
"Fill in an email address to enable password recovery" => "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката",
"Language" => "Јазик",
"Help translate" => "Помогни во преводот",
-"use this address to connect to your ownCloud in your file manager" => "користете ја оваа адреса во менаџерот за датотеки да се поврзете со Вашиот ownCloud",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Користете ја оваа адреса да ",
+"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>.",
"Name" => "Име",
-"Password" => "Лозинка",
"Groups" => "Групи",
"Create" => "Создај",
"Default Quota" => "Предефинирана квота",
"Other" => "Останато",
+"Group Admin" => "Администратор на група",
"Quota" => "Квота",
"Delete" => "Избриши"
);
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 5de247110bb..608ed7e05d5 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -12,14 +12,8 @@
"Add your App" => "Tambah apps anda",
"Select an App" => "Pilih aplikasi",
"See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
-"Documentation" => "Dokumentasi",
-"Managing Big Files" => "Mengurus Fail Besar",
-"Ask a question" => "Tanya soalan",
-"Problems connecting to help database." => "Masalah menghubung untuk membantu pengkalan data",
-"Go there manually." => "Pergi ke sana secara manual",
-"Answer" => "Jawapan",
-"Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
-"Download" => "Muat turun",
+"Clients" => "klien",
+"Password" => "Kata laluan ",
"Unable to change your password" => "Gagal mengubah kata laluan anda ",
"Current password" => "Kata laluan semasa",
"New password" => "Kata laluan baru",
@@ -30,9 +24,7 @@
"Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
"Language" => "Bahasa",
"Help translate" => "Bantu terjemah",
-"use this address to connect to your ownCloud in your file manager" => "guna alamat ini untuk menyambung owncloud anda dalam pengurus fail anda",
"Name" => "Nama",
-"Password" => "Kata laluan ",
"Groups" => "Kumpulan",
"Create" => "Buat",
"Default Quota" => "Kuota Lalai",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 23618fc3024..0800b6682e6 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -21,14 +21,8 @@
"More Apps" => "Flere Apps",
"Select an App" => "Velg en app",
"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
-"Documentation" => "Dokumentasjon",
-"Managing Big Files" => "Håndtere store filer",
-"Ask a question" => "Still et spørsmål",
-"Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
-"Go there manually." => "Gå dit manuelt",
-"Answer" => "Svar",
-"Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
-"Download" => "Last ned",
+"Clients" => "Klienter",
+"Password" => "Passord",
"Your password was changed" => "Passord har blitt endret",
"Unable to change your password" => "Kunne ikke endre passordet ditt",
"Current password" => "Nåværende passord",
@@ -40,9 +34,7 @@
"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
"Language" => "Språk",
"Help translate" => "Bidra til oversettelsen",
-"use this address to connect to your ownCloud in your file manager" => "bruk denne adressen for å koble til din ownCloud gjennom filhåndtereren",
"Name" => "Navn",
-"Password" => "Passord",
"Groups" => "Grupper",
"Create" => "Opprett",
"Default Quota" => "Standard Kvote",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index f419ecf74ed..40d8742d7b3 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -23,15 +23,18 @@
"Select an App" => "Selecteer een app",
"See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
-"Documentation" => "Documentatie",
-"Managing Big Files" => "Instellingen voor grote bestanden",
-"Ask a question" => "Stel een vraag",
-"Problems connecting to help database." => "Problemen bij het verbinden met de helpdatabank.",
-"Go there manually." => "Ga er zelf heen.",
-"Answer" => "Beantwoord",
+"User Documentation" => "Gebruikersdocumentatie",
+"Administrator Documentation" => "Beheerdersdocumentatie",
+"Online Documentation" => "Online documentatie",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Commerciële ondersteuning",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> van de <strong>%s</strong> beschikbaren gebruikt",
-"Desktop and Mobile Syncing Clients" => "Desktop en mobiele synchronisatie applicaties",
-"Download" => "Download",
+"Clients" => "Klanten",
+"Download Desktop Clients" => "Download Desktop Clients",
+"Download Android Client" => "Download Android Client",
+"Download iOS Client" => "Download iOS Client",
+"Password" => "Wachtwoord",
"Your password was changed" => "Je wachtwoord is veranderd",
"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
"Current password" => "Huidig wachtwoord",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren",
"Language" => "Taal",
"Help translate" => "Help met vertalen",
-"use this address to connect to your ownCloud in your file manager" => "Gebruik het bovenstaande adres om verbinding te maken met ownCloud in uw bestandbeheerprogramma",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
+"Version" => "Versie",
"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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Naam",
-"Password" => "Wachtwoord",
"Groups" => "Groepen",
"Create" => "Creëer",
"Default Quota" => "Standaard limiet",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 5f9d7605cc6..92ff6d22df2 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -10,11 +10,8 @@
"Enable" => "Slå på",
"__language_name__" => "Nynorsk",
"Select an App" => "Vel ein applikasjon",
-"Ask a question" => "Spør om noko",
-"Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
-"Go there manually." => "Gå der på eigen hand.",
-"Answer" => "Svar",
-"Download" => "Last ned",
+"Clients" => "Klientar",
+"Password" => "Passord",
"Unable to change your password" => "Klarte ikkje å endra passordet",
"Current password" => "Passord",
"New password" => "Nytt passord",
@@ -25,9 +22,7 @@
"Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
"Language" => "Språk",
"Help translate" => "Hjelp oss å oversett",
-"use this address to connect to your ownCloud in your file manager" => "bruk denne adressa for å kopla til ownCloud i filhandsamaren din",
"Name" => "Namn",
-"Password" => "Passord",
"Groups" => "Grupper",
"Create" => "Lag",
"Other" => "Anna",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index f16f5cc91ae..0bed7a9a416 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -21,13 +21,8 @@
"Select an App" => "Selecciona una applicacion",
"See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>",
-"Documentation" => "Documentacion",
-"Managing Big Files" => "Al bailejar de fichièrs pesucasses",
-"Ask a question" => "Respond a una question",
-"Problems connecting to help database." => "Problemas al connectar de la basa de donadas d'ajuda",
-"Go there manually." => "Vas çai manualament",
-"Answer" => "Responsa",
-"Download" => "Avalcarga",
+"Clients" => "Practica",
+"Password" => "Senhal",
"Your password was changed" => "Ton senhal a cambiat",
"Unable to change your password" => "Pas possible de cambiar ton senhal",
"Current password" => "Senhal en cors",
@@ -39,9 +34,7 @@
"Fill in an email address to enable password recovery" => "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut",
"Language" => "Lenga",
"Help translate" => "Ajuda a la revirada",
-"use this address to connect to your ownCloud in your file manager" => "utiliza aquela adreiça per te connectar al ownCloud amb ton explorator de fichièrs",
"Name" => "Nom",
-"Password" => "Senhal",
"Groups" => "Grops",
"Create" => "Crea",
"Default Quota" => "Quota per defaut",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index e17e3c00e53..3668421d9c7 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -23,15 +23,9 @@
"Select an App" => "Zaznacz aplikacje",
"See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
-"Documentation" => "Dokumentacja",
-"Managing Big Files" => "Zarządzanie dużymi plikami",
-"Ask a question" => "Zadaj pytanie",
-"Problems connecting to help database." => "Problem z połączeniem z bazą danych.",
-"Go there manually." => "Przejdź na stronę ręcznie.",
-"Answer" => "Odpowiedź",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Klienci synchronizacji",
-"Download" => "Ściągnij",
+"Clients" => "Klienci",
+"Password" => "Hasło",
"Your password was changed" => "Twoje hasło zostało zmienione",
"Unable to change your password" => "Nie można zmienić hasła",
"Current password" => "Bieżące hasło",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła",
"Language" => "Język",
"Help translate" => "Pomóż w tłumaczeniu",
-"use this address to connect to your ownCloud in your file manager" => "Proszę użyć tego adresu, aby uzyskać dostęp do usługi ownCloud w menedżerze plików.",
"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>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <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>.",
"Name" => "Nazwa",
-"Password" => "Hasło",
"Groups" => "Grupy",
"Create" => "Utwórz",
"Default Quota" => "Domyślny udział",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index d09e867f7f2..ebbdc85e45b 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -23,15 +23,9 @@
"Select an App" => "Selecione uma Aplicação",
"See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"Documentation" => "Documentação",
-"Managing Big Files" => "Gerênciando Arquivos Grandes",
-"Ask a question" => "Faça uma pergunta",
-"Problems connecting to help database." => "Problemas ao conectar na base de dados.",
-"Go there manually." => "Ir manualmente.",
-"Answer" => "Resposta",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Sincronizando Desktop e Mobile",
-"Download" => "Download",
+"Clients" => "Clientes",
+"Password" => "Senha",
"Your password was changed" => "Sua senha foi alterada",
"Unable to change your password" => "Não é possivel alterar a sua senha",
"Current password" => "Senha atual",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Preencha um endereço de email para habilitar a recuperação de senha",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
-"use this address to connect to your ownCloud in your file manager" => "use este endereço para se conectar ao seu ownCloud no seu gerenciador de arquvos",
"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 pela <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á licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nome",
-"Password" => "Senha",
"Groups" => "Grupos",
"Create" => "Criar",
"Default Quota" => "Quota Padrão",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 96d9ac67ac4..6c2a50047db 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -23,15 +23,18 @@
"Select an App" => "Selecione uma aplicação",
"See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"Documentation" => "Documentação",
-"Managing Big Files" => "Gestão de ficheiros grandes",
-"Ask a question" => "Coloque uma questão",
-"Problems connecting to help database." => "Problemas ao ligar à base de dados de ajuda",
-"Go there manually." => "Vá lá manualmente",
-"Answer" => "Resposta",
+"User Documentation" => "Documentação de Utilizador",
+"Administrator Documentation" => "Documentação de administrador.",
+"Online Documentation" => "Documentação Online",
+"Forum" => "Fórum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Suporte Comercial",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e móvel",
-"Download" => "Transferir",
+"Clients" => "Clientes",
+"Download Desktop Clients" => "Transferir os clientes de sincronização",
+"Download Android Client" => "Transferir o cliente android",
+"Download iOS Client" => "Transferir o cliente iOS",
+"Password" => "Palavra-chave",
"Your password was changed" => "A sua palavra-passe foi alterada",
"Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
"Current password" => "Palavra-chave actual",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
-"use this address to connect to your ownCloud in your file manager" => "utilize este endereço para ligar ao seu ownCloud através do seu gestor de ficheiros",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
+"Version" => "Versão",
"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 pela <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á licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nome",
-"Password" => "Palavra-chave",
"Groups" => "Grupos",
"Create" => "Criar",
"Default Quota" => "Quota por padrão",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index deabed6f803..26865c8c711 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -21,14 +21,8 @@
"Select an App" => "Selectează o aplicație",
"See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
-"Documentation" => "Documetație",
-"Managing Big Files" => "Gestionînd fișiere mari",
-"Ask a question" => "Întreabă",
-"Problems connecting to help database." => "Probleme de conectare la baza de date.",
-"Go there manually." => "Pe cale manuală.",
-"Answer" => "Răspuns",
-"Desktop and Mobile Syncing Clients" => "Clienți de sincronizare pentru telefon mobil și desktop",
-"Download" => "Descărcări",
+"Clients" => "Clienți",
+"Password" => "Parolă",
"Your password was changed" => "Parola a fost modificată",
"Unable to change your password" => "Imposibil de-ați schimbat parola",
"Current password" => "Parola curentă",
@@ -40,10 +34,8 @@
"Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola",
"Language" => "Limba",
"Help translate" => "Ajută la traducere",
-"use this address to connect to your ownCloud in your file manager" => "folosește această adresă pentru a te conecta la managerul tău de fișiere din ownCloud",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Nume",
-"Password" => "Parolă",
"Groups" => "Grupuri",
"Create" => "Crează",
"Default Quota" => "Cotă implicită",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4853f6fc2d1..bef330b92b7 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -23,15 +23,13 @@
"Select an App" => "Выберите приложение",
"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
-"Documentation" => "Документация",
-"Managing Big Files" => "Управление большими файлами",
-"Ask a question" => "Задать вопрос",
-"Problems connecting to help database." => "Проблема соединения с базой данных помощи.",
-"Go there manually." => "Войти самостоятельно.",
-"Answer" => "Ответ",
+"Forum" => "Форум",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации для рабочих станций и мобильных устройств",
-"Download" => "Загрузка",
+"Clients" => "Клиенты",
+"Download Desktop Clients" => "Загрузка приложений для компьютера",
+"Download Android Client" => "Загрузка Android-приложения",
+"Download iOS Client" => "Загрузка iOS-приложения",
+"Password" => "Пароль",
"Your password was changed" => "Ваш пароль изменён",
"Unable to change your password" => "Невозможно сменить пароль",
"Current password" => "Текущий пароль",
@@ -43,10 +41,11 @@
"Fill in an email address to enable password recovery" => "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля",
"Language" => "Язык",
"Help translate" => "Помочь с переводом",
-"use this address to connect to your ownCloud in your file manager" => "используйте данный адрес для подключения к ownCloud в вашем файловом менеджере",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
+"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>.",
"Name" => "Имя",
-"Password" => "Пароль",
"Groups" => "Группы",
"Create" => "Создать",
"Default Quota" => "Квота по умолчанию",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 83eb603ba3d..a964fe9166e 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -11,6 +11,7 @@
"Authentication error" => "Ошибка авторизации",
"Unable to delete user" => "Невозможно удалить пользователя",
"Language changed" => "Язык изменен",
+"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",
"Disable" => "Отключить",
@@ -22,15 +23,17 @@
"Select an App" => "Выбрать приложение",
"See application page at apps.owncloud.com" => "Обратитесь к странице приложений на apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"Documentation" => "Документация",
-"Managing Big Files" => "Управление большими файлами",
-"Ask a question" => "Задать вопрос",
-"Problems connecting to help database." => "Проблемы, связанные с разделом Помощь базы данных",
-"Go there manually." => "Сделать вручную.",
-"Answer" => "Ответ",
+"User Documentation" => "Документация пользователя",
+"Administrator Documentation" => "Документация администратора",
+"Online Documentation" => "Документация online",
+"Forum" => "Форум",
+"Bugtracker" => "Отслеживание ошибок",
+"Commercial Support" => "Коммерческая поддержка",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации настольной и мобильной систем",
-"Download" => "Загрузка",
+"Clients" => "Клиенты",
+"Download Android Client" => "Загрузить клиент под Android ",
+"Download iOS Client" => "Загрузить клиент под iOS ",
+"Password" => "Пароль",
"Your password was changed" => "Ваш пароль был изменен",
"Unable to change your password" => "Невозможно изменить Ваш пароль",
"Current password" => "Текущий пароль",
@@ -42,10 +45,11 @@
"Fill in an email address to enable password recovery" => "Введите адрес электронной почты для возможности восстановления пароля",
"Language" => "Язык",
"Help translate" => "Помогите перевести",
-"use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для соединения с Вашим ownCloud в файловом менеджере",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере",
+"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 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>.",
"Name" => "Имя",
-"Password" => "Пароль",
"Groups" => "Группы",
"Create" => "Создать",
"Default Quota" => "Квота по умолчанию",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 13bd1762d42..6c46834beb1 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -18,13 +18,8 @@
"Add your App" => "යෙදුමක් එක් කිරීම",
"More Apps" => "තවත් යෙදුම්",
"Select an App" => "යෙදුමක් තොරන්න",
-"Documentation" => "ලේඛන",
-"Managing Big Files" => "විශාල ගොනු කළමණාකරනය",
-"Ask a question" => "ප්‍රශ්ණයක් අසන්න",
-"Problems connecting to help database." => "උදව් දත්ත ගබඩාව හා සම්බන්ධවීමේදී ගැටළු ඇතිවිය.",
-"Go there manually." => "ස්වශක්තියෙන් එතැනට යන්න",
-"Answer" => "පිළිතුර",
-"Download" => "භාගත කරන්න",
+"Clients" => "සේවාලාභීන්",
+"Password" => "මුරපදය",
"Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
"Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
"Current password" => "වත්මන් මුරපදය",
@@ -36,10 +31,8 @@
"Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
"Language" => "භාෂාව",
"Help translate" => "පරිවර්ථන සහය",
-"use this address to connect to your ownCloud in your file manager" => "ඔබගේ ගොනු කළමනාකරු ownCloudයට සම්බන්ධ කිරීමට මෙම ලිපිනය භාවිතා කරන්න",
"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>, the <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> යටතේ.",
"Name" => "නාමය",
-"Password" => "මුරපදය",
"Groups" => "සමූහය",
"Create" => "තනන්න",
"Default Quota" => "සාමාන්‍ය සලාකය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 179cbe250b5..08b9079c3ae 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -23,15 +23,9 @@
"Select an App" => "Vyberte aplikáciu",
"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
-"Documentation" => "Dokumentácia",
-"Managing Big Files" => "Správa veľkých súborov",
-"Ask a question" => "Opýtať sa otázku",
-"Problems connecting to help database." => "Problémy s pripojením na databázu pomocníka.",
-"Go there manually." => "Prejsť tam ručne.",
-"Answer" => "Odpoveď",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
-"Desktop and Mobile Syncing Clients" => "Klienti pre synchronizáciu",
-"Download" => "Stiahnúť",
+"Clients" => "Klienti",
+"Password" => "Heslo",
"Your password was changed" => "Heslo bolo zmenené",
"Unable to change your password" => "Nie je možné zmeniť vaše heslo",
"Current password" => "Aktuálne heslo",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
"Language" => "Jazyk",
"Help translate" => "Pomôcť s prekladom",
-"use this address to connect to your ownCloud in your file manager" => "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov",
"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>.",
"Name" => "Meno",
-"Password" => "Heslo",
"Groups" => "Skupiny",
"Create" => "Vytvoriť",
"Default Quota" => "Predvolená kvóta",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index b65a7ad641d..01d1d481b97 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -23,15 +23,9 @@
"Select an App" => "Izberite program",
"See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>",
-"Documentation" => "Dokumentacija",
-"Managing Big Files" => "Upravljanje velikih datotek",
-"Ask a question" => "Zastavi vprašanje",
-"Problems connecting to help database." => "Težave med povezovanjem s podatkovno zbirko pomoči.",
-"Go there manually." => "Ustvari povezavo ročno.",
-"Answer" => "Odgovor",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljate <strong>%s</strong> od razpoložljivih <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za usklajevanje",
-"Download" => "Prejmi",
+"Clients" => "Stranka",
+"Password" => "Geslo",
"Your password was changed" => "Vaše geslo je spremenjeno",
"Unable to change your password" => "Gesla ni mogoče spremeniti.",
"Current password" => "Trenutno geslo",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla",
"Language" => "Jezik",
"Help translate" => "Pomagajte pri prevajanju",
-"use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v upravljalniku datotek.",
"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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>.",
"Name" => "Ime",
-"Password" => "Geslo",
"Groups" => "Skupine",
"Create" => "Ustvari",
"Default Quota" => "Privzeta količinska omejitev",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 924d6a07b39..be30ab45f53 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -23,15 +23,9 @@
"Select an App" => "Изаберите програм",
"See application page at apps.owncloud.com" => "Погледајте страницу са програмима на apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
-"Documentation" => "Документација",
-"Managing Big Files" => "Управљање великим датотекама",
-"Ask a question" => "Поставите питање",
-"Problems connecting to help database." => "Проблем у повезивању са базом помоћи",
-"Go there manually." => "Отиђите тамо ручно.",
-"Answer" => "Одговор",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Стони и мобилни клијенти за усклађивање",
-"Download" => "Преузимање",
+"Clients" => "Клијенти",
+"Password" => "Лозинка",
"Your password was changed" => "Лозинка је промењена",
"Unable to change your password" => "Не могу да изменим вашу лозинку",
"Current password" => "Тренутна лозинка",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Ун",
"Language" => "Језик",
"Help translate" => " Помозите у превођењу",
-"use this address to connect to your ownCloud in your file manager" => "користите ову адресу да би се повезали на ownCloud путем менаџњера фајлова",
"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)\">АГПЛ лиценцом</abbr></a>.",
"Name" => "Име",
-"Password" => "Лозинка",
"Groups" => "Групе",
"Create" => "Направи",
"Default Quota" => "Подразумевано ограничење",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 13d3190df8b..9ee84bc255a 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -4,11 +4,8 @@
"Authentication error" => "Greška pri autentifikaciji",
"Language changed" => "Jezik je izmenjen",
"Select an App" => "Izaberite program",
-"Ask a question" => "Postavite pitanje",
-"Problems connecting to help database." => "Problem u povezivanju sa bazom pomoći",
-"Go there manually." => "Otiđite tamo ručno.",
-"Answer" => "Odgovor",
-"Download" => "Preuzmi",
+"Clients" => "Klijenti",
+"Password" => "Lozinka",
"Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
"Current password" => "Trenutna lozinka",
"New password" => "Nova lozinka",
@@ -16,9 +13,7 @@
"Change password" => "Izmeni lozinku",
"Email" => "E-mail",
"Language" => "Jezik",
-"use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu da bi se povezali na ownCloud putem menadžnjera fajlova",
"Name" => "Ime",
-"Password" => "Lozinka",
"Groups" => "Grupe",
"Create" => "Napravi",
"Other" => "Drugo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index c829e0376b7..15e4bfd035e 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -23,15 +23,18 @@
"Select an App" => "Välj en App",
"See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Hantering av stora filer",
-"Ask a question" => "Ställ en fråga",
-"Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
-"Go there manually." => "Gå dit manuellt.",
-"Answer" => "Svar",
+"User Documentation" => "Användardokumentation",
+"Administrator Documentation" => "Administratördokumentation",
+"Online Documentation" => "Onlinedokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommersiell support",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
-"Download" => "Ladda ner",
+"Clients" => "Kunder",
+"Download Desktop Clients" => "Ladda ner skrivbordsklienter",
+"Download Android Client" => "Ladda ner klient för Android",
+"Download iOS Client" => "Ladda ner klient för iOS",
+"Password" => "Lösenord",
"Your password was changed" => "Ditt lösenord har ändrats",
"Unable to change your password" => "Kunde inte ändra ditt lösenord",
"Current password" => "Nuvarande lösenord",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
"Language" => "Språk",
"Help translate" => "Hjälp att översätta",
-"use this address to connect to your ownCloud in your file manager" => "använd denna adress för att ansluta ownCloud till din filhanterare",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
+"Version" => "Version",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Namn",
-"Password" => "Lösenord",
"Groups" => "Grupper",
"Create" => "Skapa",
"Default Quota" => "Förvald datakvot",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index c0189a5bdaf..cbc2eec8fb7 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -22,15 +22,9 @@
"Select an App" => "செயலி ஒன்றை தெரிவுசெய்க",
"See application page at apps.owncloud.com" => "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>",
-"Documentation" => "ஆவணமாக்கல்",
-"Managing Big Files" => "பெரிய கோப்புகளை முகாமைப்படுத்தல்",
-"Ask a question" => "வினா ஒன்றை கேட்க",
-"Problems connecting to help database." => "தரவுதளத்தை இணைக்கும் உதவியில் பிரச்சினைகள்",
-"Go there manually." => "கைமுறையாக அங்கு செல்க",
-"Answer" => "விடை",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
-"Desktop and Mobile Syncing Clients" => "desktop மற்றும் Mobile ஒத்திசைவு சேவைப் பயனாளர்",
-"Download" => "பதிவிறக்குக",
+"Clients" => "வாடிக்கையாளர்கள்",
+"Password" => "கடவுச்சொல்",
"Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
"Unable to change your password" => "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது",
"Current password" => "தற்போதைய கடவுச்சொல்",
@@ -42,10 +36,8 @@
"Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
"Language" => "மொழி",
"Help translate" => "மொழிபெயர்க்க உதவி",
-"use this address to connect to your ownCloud in your file manager" => "உங்களுடைய கோப்பு முகாமையில் உள்ள உங்களுடைய ownCloud உடன் இணைக்க இந்த முகவரியை பயன்படுத்தவும்",
"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>." => "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>.",
"Name" => "பெயர்",
-"Password" => "கடவுச்சொல்",
"Groups" => "குழுக்கள்",
"Create" => "உருவாக்குக",
"Default Quota" => "பொது இருப்பு பங்கு",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 3431fedac0a..063ec8733ae 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -22,15 +22,9 @@
"Select an App" => "เลือก App",
"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
-"Documentation" => "เอกสารคู่มือการใช้งาน",
-"Managing Big Files" => "การจัดการไฟล์ขนาดใหญ่",
-"Ask a question" => "สอบถามข้อมูล",
-"Problems connecting to help database." => "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ",
-"Go there manually." => "ไปที่นั่นด้วยตนเอง",
-"Answer" => "คำตอบ",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "โปรแกรมเชื่อมข้อมูลไฟล์สำหรับเครื่องเดสก์ท็อปและมือถือ",
-"Download" => "ดาวน์โหลด",
+"Clients" => "ลูกค้า",
+"Password" => "รหัสผ่าน",
"Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
"Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
"Current password" => "รหัสผ่านปัจจุบัน",
@@ -42,10 +36,8 @@
"Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
"Language" => "ภาษา",
"Help translate" => "ช่วยกันแปล",
-"use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้ในการเชื่อมต่อกับบัญชี ownCloud ของคุณในเครื่องมือจัดการไฟล์ของคุณ",
"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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <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>.",
"Name" => "ชื่อ",
-"Password" => "รหัสผ่าน",
"Groups" => "กลุ่ม",
"Create" => "สร้าง",
"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 1e301e8d323..44dee92a3fc 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -20,14 +20,17 @@
"More Apps" => "Daha fazla App",
"Select an App" => "Bir uygulama seçin",
"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
-"Documentation" => "Dökümantasyon",
-"Managing Big Files" => "Büyük Dosyaların Yönetimi",
-"Ask a question" => "Bir soru sorun",
-"Problems connecting to help database." => "Yardım veritabanına bağlanmada sorunlar var.",
-"Go there manually." => "Oraya elle gidin.",
-"Answer" => "Cevap",
-"Desktop and Mobile Syncing Clients" => "Masaüstü ve Mobil Senkron İstemcileri",
-"Download" => "İndir",
+"User Documentation" => "Kullanıcı Belgelendirmesi",
+"Administrator Documentation" => "Yönetici Belgelendirmesi",
+"Online Documentation" => "Çevrimiçi Belgelendirme",
+"Forum" => "Forum",
+"Bugtracker" => "Hata Takip Sistemi",
+"Commercial Support" => "Ticari Destek",
+"Clients" => "Müşteriler",
+"Download Desktop Clients" => "Masaüstü İstemcilerini İndir",
+"Download Android Client" => "Android İstemcisini İndir",
+"Download iOS Client" => "iOS İstemcisini İndir",
+"Password" => "Parola",
"Your password was changed" => "Şifreniz değiştirildi",
"Unable to change your password" => "Parolanız değiştirilemiyor",
"Current password" => "Mevcut parola",
@@ -39,10 +42,10 @@
"Fill in an email address to enable password recovery" => "Parola sıfırlamayı aktifleştirmek için eposta adresi girin",
"Language" => "Dil",
"Help translate" => "Çevirilere yardım edin",
-"use this address to connect to your ownCloud in your file manager" => "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanın",
+"WebDAV" => "WebDAV",
+"Version" => "Sürüm",
"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>." => "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Ad",
-"Password" => "Parola",
"Groups" => "Gruplar",
"Create" => "Oluştur",
"Default Quota" => "Varsayılan Kota",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index d1a0d6d9091..b9f48b2e881 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -23,15 +23,18 @@
"Select an App" => "Вибрати додаток",
"See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"Documentation" => "Документація",
-"Managing Big Files" => "Управління великими файлами",
-"Ask a question" => "Запитати",
-"Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
-"Go there manually." => "Перейти вручну.",
-"Answer" => "Відповідь",
+"User Documentation" => "Документація Користувача",
+"Administrator Documentation" => "Документація Адміністратора",
+"Online Documentation" => "Он-Лайн Документація",
+"Forum" => "Форум",
+"Bugtracker" => "БагТрекер",
+"Commercial Support" => "Комерційна підтримка",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Настільні та мобільні клієнти синхронізації",
-"Download" => "Завантажити",
+"Clients" => "Клієнти",
+"Download Desktop Clients" => "Завантажити клієнт для ПК",
+"Download Android Client" => "Завантажити клієнт для Android",
+"Download iOS Client" => "Завантажити клієнт для iOS",
+"Password" => "Пароль",
"Your password was changed" => "Ваш пароль змінено",
"Unable to change your password" => "Не вдалося змінити Ваш пароль",
"Current password" => "Поточний пароль",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "Введіть адресу електронної пошти для відновлення паролю",
"Language" => "Мова",
"Help translate" => "Допомогти з перекладом",
-"use this address to connect to your ownCloud in your file manager" => "використовувати цю адресу для з'єднання з ownCloud у Вашому файловому менеджері",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері",
+"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>.",
"Name" => "Ім'я",
-"Password" => "Пароль",
"Groups" => "Групи",
"Create" => "Створити",
"Default Quota" => "Квота за замовчуванням",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 7857b0509e6..50259953acd 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -23,15 +23,9 @@
"Select an App" => "Chọn một ứng dụng",
"See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn tại apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi <span class=\"author\"></span>",
-"Documentation" => "Tài liệu",
-"Managing Big Files" => "Quản lý tập tin lớn",
-"Ask a question" => "Đặt câu hỏi",
-"Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
-"Go there manually." => "Đến bằng thủ công.",
-"Answer" => "trả lời",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
-"Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
-"Download" => "Tải về",
+"Clients" => "Khách hàng",
+"Password" => "Mật khẩu",
"Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
"Unable to change your password" => "Không thể đổi mật khẩu",
"Current password" => "Mật khẩu cũ",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
"Language" => "Ngôn ngữ",
"Help translate" => "Hỗ trợ dịch thuật",
-"use this address to connect to your ownCloud in your file manager" => "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin ",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Name" => "Tên",
-"Password" => "Mật khẩu",
"Groups" => "Nhóm",
"Create" => "Tạo",
"Default Quota" => "Hạn ngạch mặt định",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 4784ff7ff9d..cd6610d5a17 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -22,14 +22,8 @@
"Select an App" => "选择一个程序",
"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>",
-"Documentation" => "文档",
-"Managing Big Files" => "管理大文件",
-"Ask a question" => "提一个问题",
-"Problems connecting to help database." => "连接到帮助数据库时的问题",
-"Go there manually." => "收到转到.",
-"Answer" => "回答",
-"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
-"Download" => "下载",
+"Clients" => "客户",
+"Password" => "密码",
"Your password was changed" => "您的密码以变更",
"Unable to change your password" => "不能改变你的密码",
"Current password" => "现在的密码",
@@ -41,10 +35,8 @@
"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
"Language" => "语言",
"Help translate" => "帮助翻译",
-"use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的ownCloud",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发,<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
"Name" => "名字",
-"Password" => "密码",
"Groups" => "组",
"Create" => "新建",
"Default Quota" => "默认限额",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 87c8172d6fa..99fb0b2279c 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -23,15 +23,18 @@
"Select an App" => "选择一个应用",
"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
-"Documentation" => "文档",
-"Managing Big Files" => "管理大文件",
-"Ask a question" => "提问",
-"Problems connecting to help database." => "连接帮助数据库错误 ",
-"Go there manually." => "手动访问",
-"Answer" => "回答",
+"User Documentation" => "用户文档",
+"Administrator Documentation" => "管理员文档",
+"Online Documentation" => "在线文档",
+"Forum" => "论坛",
+"Bugtracker" => "问题跟踪器",
+"Commercial Support" => "商业支持",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>,有效空间 <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "桌面和移动设备同步客户端",
-"Download" => "下载",
+"Clients" => "客户",
+"Download Desktop Clients" => "下载桌面客户端",
+"Download Android Client" => "下载 Android 客户端",
+"Download iOS Client" => "下载 iOS 客户端",
+"Password" => "密码",
"Your password was changed" => "密码已修改",
"Unable to change your password" => "无法修改密码",
"Current password" => "当前密码",
@@ -43,10 +46,11 @@
"Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能",
"Language" => "语言",
"Help translate" => "帮助翻译",
-"use this address to connect to your ownCloud in your file manager" => "您可在文件管理器中使用该地址连接到ownCloud",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
+"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>许可证下发布。",
"Name" => "名称",
-"Password" => "密码",
"Groups" => "组",
"Create" => "创建",
"Default Quota" => "默认配额",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 7de5ee5f54d..6589973bf99 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -23,15 +23,9 @@
"Select an App" => "選擇一個應用程式",
"See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
-"Documentation" => "文件",
-"Managing Big Files" => "管理大檔案",
-"Ask a question" => "提問",
-"Problems connecting to help database." => "連接到求助資料庫時發生問題",
-"Go there manually." => "手動前往",
-"Answer" => "答案",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ,目前可用空間為 <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "桌機與手機同步客戶端",
-"Download" => "下載",
+"Clients" => "客戶",
+"Password" => "密碼",
"Your password was changed" => "你的密碼已更改",
"Unable to change your password" => "無法變更你的密碼",
"Current password" => "目前密碼",
@@ -43,10 +37,8 @@
"Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
"Language" => "語言",
"Help translate" => "幫助翻譯",
-"use this address to connect to your ownCloud in your file manager" => "使用這個位址去連接到你的私有雲檔案管理員",
"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>許可證下發布。",
"Name" => "名稱",
-"Password" => "密碼",
"Groups" => "群組",
"Create" => "創造",
"Default Quota" => "預設容量限制",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9c4ee0bf680..26335063d4b 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -3,30 +3,44 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
-$levels=array('Debug','Info','Warning','Error', 'Fatal');
+$levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
?>
<?php
-if(!$_['htaccessworking']) {
-?>
+// is htaccess working ?
+if (!$_['htaccessworking']) {
+ ?>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+ <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<span class="securitywarning">
<?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
</span>
-
-</fieldset>
-<?php
+
+</fieldset>
+<?php
}
-?>
+// is locale working ?
+if (!$_['islocaleworking']) {
+ ?>
+<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+
+ <span class="connectionwarning">
+ <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
+ </span>
+
+</fieldset>
<?php
-if(!$_['internetconnectionworking']) {
-?>
+}
+
+// is internet connection working ?
+if (!$_['internetconnectionworking']) {
+ ?>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+ <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
<span class="connectionwarning">
<?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
@@ -37,104 +51,126 @@ if(!$_['internetconnectionworking']) {
}
?>
-<?php foreach($_['forms'] as $form) {
- echo $form;
-};?>
+<?php foreach ($_['forms'] as $form) {
+ echo $form;
+}
+;?>
<fieldset class="personalblock" id="backgroundjobs">
- <legend><strong><?php echo $l->t('Cron');?></strong></legend>
- <table class="nostyle">
- <tr>
- <td>
- <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
- <label for="backgroundjobs_ajax">AJAX</label><br />
- <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
- </td>
- </tr><tr>
- <td>
- <input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
- <label for="backgroundjobs_webcron">Webcron</label><br />
- <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
- </td>
- </tr><tr>
- <td>
- <input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
- <label for="backgroundjobs_cron">Cron</label><br />
- <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
- </td>
- </tr>
- </table>
+ <legend><strong><?php echo $l->t('Cron');?></strong></legend>
+ <table class="nostyle">
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="ajax"
+ id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+ echo 'checked="checked"';
+ } ?>>
+ <label for="backgroundjobs_ajax">AJAX</label><br/>
+ <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="webcron"
+ id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+ echo 'checked="checked"';
+ } ?>>
+ <label for="backgroundjobs_webcron">Webcron</label><br/>
+ <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="cron"
+ id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+ echo 'checked="checked"';
+ } ?>>
+ <label for="backgroundjobs_cron">Cron</label><br/>
+ <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+ </td>
+ </tr>
+ </table>
</fieldset>
<fieldset class="personalblock" id="shareAPI">
- <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
- <table class="shareAPI nostyle">
- <tr>
- <td id="enable">
- <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
- <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
- <em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
- </td>
- </tr><tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
- <input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
- <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
- <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
- </td>
- </tr><tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
- <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
- <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
- <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
- </td>
- </tr><tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
- <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
- <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
- <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
- <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br />
- </td>
- </tr>
- </table>
+ <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
+ <table class="shareAPI nostyle">
+ <tr>
+ <td id="enable">
+ <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
+ value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+ <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
+ <em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+ <input type="checkbox" name="shareapi_allow_links" id="allowLinks"
+ value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+ <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
+ <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+ <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
+ value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+ <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
+ <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+ </td>
+ </tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+ <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
+ value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+ <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
+ <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
+ value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+ <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
+ </td>
+ </tr>
+ </table>
</fieldset>
<fieldset class="personalblock">
- <legend><strong><?php echo $l->t('Log');?></strong></legend>
- Log level: <select name='loglevel' id='loglevel'>
- <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
- <?php for($i=0;$i<5;$i++):
- if($i!=$_['loglevel']):?>
- <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
- <?php endif;
- endfor;?>
- </select>
- <table id='log'>
- <?php foreach($_['entries'] as $entry):?>
- <tr>
- <td>
- <?php echo $levels[$entry->level];?>
- </td>
- <td>
- <?php echo $entry->app;?>
- </td>
- <td>
- <?php echo $entry->message;?>
- </td>
- <td>
- <?php echo OC_Util::formatDate($entry->time);?>
- </td>
- </tr>
- <?php endforeach;?>
-</table>
-<?php if($_['entriesremain']): ?>
-<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
-<?php endif; ?>
+ <legend><strong><?php echo $l->t('Log');?></strong></legend>
+ <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
+ <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
+ <?php for ($i = 0; $i < 5; $i++):
+ if ($i != $_['loglevel']):?>
+ <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+ <?php endif;
+endfor;?>
+</select>
+ <table id='log'>
+ <?php foreach ($_['entries'] as $entry): ?>
+ <tr>
+ <td>
+ <?php echo $levels[$entry->level];?>
+ </td>
+ <td>
+ <?php echo $entry->app;?>
+ </td>
+ <td>
+ <?php echo $entry->message;?>
+ </td>
+ <td>
+ <?php echo OC_Util::formatDate($entry->time);?>
+ </td>
+ </tr>
+ <?php endforeach;?>
+ </table>
+ <?php if ($_['entriesremain']): ?>
+ <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
+ <?php endif; ?>
</fieldset>
-<p class="personalblock">
- <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
+<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Version');?></strong></legend>
+ <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
+ (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
-</p>
+</fieldset>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 75201a86a9f..b697905f7ef 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,34 +1,35 @@
-<?php
-/**
- * 2012 Frank Karlitschek frank@owncloud.org
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */?>
-
<div id="controls">
- <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Documentation' ); ?></a>
- <a class="button newquestion" href="http://owncloud.org/support/big-files" target="_blank"><?php echo $l->t( 'Managing Big Files' ); ?></a>
- <a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a>
- <?php
- $url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
- $pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
- if($pageNavi) {
- $pageNavi->printPage();
- }
- ?>
-</diV>
-<?php if(!is_array($_["kbe"]) || !count($_["kbe"])):?>
- <div class="helpblock">
- <p><?php echo $l->t('Problems connecting to help database.');?></p>
- <p><a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a></p>
- </div>
-<?php else:?>
- <?php foreach($_["kbe"] as $kb): ?>
- <div class="helpblock">
- <?php if($kb["preview1"] <> "") echo('<img class="preview" src="'.$kb["preview1"].'" />'); ?>
- <?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
- <p><?php echo $kb['description'];?></p>
- <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
- </div>
- <?php endforeach;
-endif?>
+ <?php if($_['admin']) { ?>
+ <a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
+ <a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+ <?php } ?>
+ <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
+ <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+ <?php if($_['admin']) { ?>
+ <a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
+ <?php } ?>
+ <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+</div>
+<br /><br />
+<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
+
+
+<script language="JavaScript">
+<!--
+
+function pageY(elem) {
+ return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
+}
+var buffer = 5; //scroll bar buffer
+function resizeIframe() {
+ var height = document.documentElement.clientHeight;
+ height -= pageY(document.getElementById('ifm'))+ buffer ;
+ height = (height < 0) ? 0 : height;
+ document.getElementById('ifm').style.height = height + 'px';
+}
+
+document.getElementById('ifm').onload=resizeIframe;
+window.onresize = resizeIframe;
+
+//-->
+</script>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d02bcdd7ea5..35eb0ef5e9a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -8,26 +8,29 @@
<p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p>
</div></div>
-<div class="personalblock">
- <?php echo $l->t('Desktop and Mobile Syncing Clients');?>
- <a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download');?></a>
-</div>
+<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Clients');?></strong></legend>
+ <a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
+ <a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a>
+ <a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
+</fieldset>
<form id="passwordform">
<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Password');?></strong></legend>
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
- <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>
+ <input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
</fieldset>
</form>
<form id="lostpassword">
<fieldset class="personalblock">
- <label for="email"><strong><?php echo $l->t('Email');?></strong></label>
+ <legend><strong><?php echo $l->t('Email');?></strong></legend>
<input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
</fieldset>
@@ -35,7 +38,7 @@
<form>
<fieldset class="personalblock">
- <label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label>
+ <legend><strong><?php echo $l->t('Language');?></strong></legend>
<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>">
<?php foreach($_['languages'] as $language):?>
<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
@@ -45,20 +48,21 @@
</fieldset>
</form>
-<p class="personalblock">
- <strong>WebDAV</strong>
+<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('WebDAV');?></strong></legend>
<code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br />
- <em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
-</p>
+ <em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em>
+</fieldset>
<?php foreach($_['forms'] as $form) {
echo $form;
};?>
-<p class="personalblock">
+<fieldset class="personalblock">
+ <legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
-</p>
+</fieldset>
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 12368a1cdb6..de8092eeaff 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -6,4 +6,4 @@
<?php foreach($_['forms'] as $form) {
echo $form;
-};?> \ No newline at end of file
+};