aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/admin_dependencies_chk/l10n/cs_CZ.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/de.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/eo.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/et_EE.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/fr.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/it.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/ja_JP.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/sl.php14
-rw-r--r--apps/admin_dependencies_chk/l10n/th_TH.php14
-rw-r--r--apps/admin_migrate/l10n/cs_CZ.php5
-rw-r--r--apps/admin_migrate/l10n/de.php5
-rw-r--r--apps/admin_migrate/l10n/eo.php5
-rw-r--r--apps/admin_migrate/l10n/et_EE.php5
-rw-r--r--apps/admin_migrate/l10n/fi_FI.php4
-rw-r--r--apps/admin_migrate/l10n/fr.php5
-rw-r--r--apps/admin_migrate/l10n/it.php5
-rw-r--r--apps/admin_migrate/l10n/ja_JP.php5
-rw-r--r--apps/admin_migrate/l10n/sl.php5
-rw-r--r--apps/admin_migrate/l10n/th_TH.php5
-rw-r--r--apps/bookmarks/img/bookmarks.pngbin496 -> 398 bytes
-rw-r--r--apps/bookmarks/l10n/cs_CZ.php12
-rw-r--r--apps/bookmarks/l10n/th_TH.php12
-rw-r--r--apps/calendar/appinfo/remote.php11
-rw-r--r--apps/calendar/css/import.css2
-rw-r--r--apps/calendar/img/icon.pngbin423 -> 360 bytes
-rw-r--r--apps/calendar/l10n/cs_CZ.php42
-rw-r--r--apps/calendar/l10n/de.php1
-rw-r--r--apps/calendar/l10n/eo.php8
-rw-r--r--apps/calendar/l10n/ja_JP.php7
-rw-r--r--apps/calendar/l10n/ru.php15
-rw-r--r--apps/calendar/l10n/sl.php42
-rw-r--r--apps/calendar/l10n/th_TH.php42
-rw-r--r--apps/calendar/lib/import.php6
-rw-r--r--apps/contacts/ajax/contact/add.php6
-rw-r--r--apps/contacts/ajax/contact/details.php6
-rw-r--r--apps/contacts/ajax/contact/move.php30
-rw-r--r--apps/contacts/appinfo/remote.php11
-rw-r--r--apps/contacts/img/contact-new.pngbin658 -> 525 bytes
-rw-r--r--apps/contacts/img/person.pngbin978 -> 852 bytes
-rw-r--r--apps/contacts/img/person_large.pngbin7929 -> 6993 bytes
-rw-r--r--apps/contacts/js/contacts.js30
-rw-r--r--apps/contacts/l10n/ca.php1
-rw-r--r--apps/contacts/l10n/cs_CZ.php50
-rw-r--r--apps/contacts/l10n/de.php1
-rw-r--r--apps/contacts/l10n/el.php7
-rw-r--r--apps/contacts/l10n/eo.php13
-rw-r--r--apps/contacts/l10n/fr.php1
-rw-r--r--apps/contacts/l10n/it.php1
-rw-r--r--apps/contacts/l10n/ja_JP.php41
-rw-r--r--apps/contacts/l10n/sl.php51
-rw-r--r--apps/contacts/l10n/sv.php3
-rw-r--r--apps/contacts/l10n/th_TH.php51
-rw-r--r--apps/contacts/lib/vcard.php29
-rw-r--r--apps/contacts/templates/part.contact.php1
-rw-r--r--apps/external/img/external.pngbin459 -> 412 bytes
-rw-r--r--apps/files/index.php4
-rw-r--r--apps/files/l10n/cs_CZ.php8
-rw-r--r--apps/files/l10n/sl.php5
-rw-r--r--apps/files/l10n/th_TH.php8
-rw-r--r--apps/files/l10n/zh_CN.php7
-rw-r--r--apps/files_archive/lib/storage.php34
-rw-r--r--apps/files_encryption/l10n/cs_CZ.php6
-rw-r--r--apps/files_encryption/l10n/eo.php6
-rw-r--r--apps/files_encryption/l10n/et_EE.php6
-rw-r--r--apps/files_encryption/l10n/fi_FI.php6
-rw-r--r--apps/files_encryption/l10n/fr.php6
-rw-r--r--apps/files_encryption/l10n/it.php6
-rw-r--r--apps/files_encryption/l10n/ja_JP.php6
-rw-r--r--apps/files_encryption/l10n/sl.php6
-rw-r--r--apps/files_encryption/l10n/th_TH.php6
-rw-r--r--apps/files_external/l10n/de.php18
-rw-r--r--apps/files_external/l10n/eo.php18
-rw-r--r--apps/files_external/l10n/et_EE.php12
-rw-r--r--apps/files_external/l10n/fi_FI.php16
-rw-r--r--apps/files_external/l10n/fr.php18
-rw-r--r--apps/files_external/l10n/it.php18
-rw-r--r--apps/files_external/l10n/ja_JP.php18
-rw-r--r--apps/files_external/l10n/sl.php18
-rw-r--r--apps/files_external/l10n/th_TH.php18
-rw-r--r--apps/files_imageviewer/img/fancybox-y.pngbin176 -> 166 bytes
-rw-r--r--apps/files_sharing/l10n/cs_CZ.php11
-rw-r--r--apps/files_sharing/l10n/de.php11
-rw-r--r--apps/files_sharing/l10n/eo.php11
-rw-r--r--apps/files_sharing/l10n/et_EE.php11
-rw-r--r--apps/files_sharing/l10n/fi_FI.php9
-rw-r--r--apps/files_sharing/l10n/fr.php11
-rw-r--r--apps/files_sharing/l10n/it.php11
-rw-r--r--apps/files_sharing/l10n/ja_JP.php11
-rw-r--r--apps/files_sharing/l10n/sl.php11
-rw-r--r--apps/files_sharing/l10n/th_TH.php11
-rw-r--r--apps/files_versions/l10n/cs_CZ.php4
-rw-r--r--apps/files_versions/l10n/de.php4
-rw-r--r--apps/files_versions/l10n/eo.php4
-rw-r--r--apps/files_versions/l10n/et_EE.php4
-rw-r--r--apps/files_versions/l10n/fi_FI.php4
-rw-r--r--apps/files_versions/l10n/fr.php4
-rw-r--r--apps/files_versions/l10n/it.php4
-rw-r--r--apps/files_versions/l10n/ja_JP.php4
-rw-r--r--apps/files_versions/l10n/sl.php4
-rw-r--r--apps/files_versions/l10n/th_TH.php4
-rw-r--r--apps/gallery/img/breadcrumb.pngbin220 -> 201 bytes
-rw-r--r--apps/gallery/img/delete.pngbin275 -> 240 bytes
-rw-r--r--apps/gallery/img/rename.pngbin310 -> 267 bytes
-rw-r--r--apps/gallery/img/share.pngbin377 -> 338 bytes
-rw-r--r--apps/gallery/img/supersized/back.pngbin2629 -> 2319 bytes
-rw-r--r--apps/gallery/img/supersized/bg-black.pngbin1074 -> 1065 bytes
-rw-r--r--apps/gallery/img/supersized/button-tray-down.pngbin1506 -> 1464 bytes
-rw-r--r--apps/gallery/img/supersized/button-tray-up.pngbin1466 -> 1451 bytes
-rw-r--r--apps/gallery/img/supersized/forward.pngbin2614 -> 2316 bytes
-rw-r--r--apps/gallery/img/supersized/nav-bg.pngbin995 -> 993 bytes
-rw-r--r--apps/gallery/img/supersized/nav-dot.pngbin1901 -> 1640 bytes
-rw-r--r--apps/gallery/img/supersized/pause.pngbin1131 -> 1124 bytes
-rw-r--r--apps/gallery/img/supersized/play.pngbin1562 -> 1549 bytes
-rw-r--r--apps/gallery/img/supersized/progress-back.pngbin929 -> 924 bytes
-rw-r--r--apps/gallery/img/supersized/progress-bar.pngbin929 -> 924 bytes
-rw-r--r--apps/gallery/img/supersized/supersized-logo.pngbin3982 -> 3488 bytes
-rw-r--r--apps/gallery/img/supersized/thumb-back.pngbin2122 -> 2010 bytes
-rw-r--r--apps/gallery/img/supersized/thumb-forward.pngbin2118 -> 2007 bytes
-rw-r--r--apps/gallery/l10n/cs_CZ.php13
-rw-r--r--apps/gallery/l10n/th_TH.php13
-rw-r--r--apps/gallery/l10n/zh_CN.php13
-rw-r--r--apps/media/l10n/eo.php5
-rw-r--r--apps/remoteStorage/img/remoteStorage.pngbin1273 -> 1024 bytes
-rw-r--r--apps/tasks/img/icon.pngbin457 -> 372 bytes
-rw-r--r--apps/tasks/l10n/de.php24
-rw-r--r--apps/tasks/l10n/eo.php24
-rw-r--r--apps/tasks/l10n/es.php24
-rw-r--r--apps/tasks/l10n/et_EE.php24
-rw-r--r--apps/tasks/l10n/fi_FI.php14
-rw-r--r--apps/tasks/l10n/fr.php24
-rw-r--r--apps/tasks/l10n/it.php24
-rw-r--r--apps/tasks/l10n/ja_JP.php24
-rw-r--r--apps/tasks/l10n/ro.php24
-rw-r--r--apps/tasks/l10n/sl.php18
-rw-r--r--apps/tasks/l10n/th_TH.php24
-rw-r--r--apps/user_ldap/l10n/cs_CZ.php36
-rw-r--r--apps/user_ldap/l10n/de.php20
-rw-r--r--apps/user_ldap/l10n/eo.php32
-rw-r--r--apps/user_ldap/l10n/fr.php30
-rw-r--r--apps/user_ldap/l10n/it.php36
-rw-r--r--apps/user_ldap/l10n/ja_JP.php36
-rw-r--r--apps/user_ldap/l10n/ro.php36
-rw-r--r--apps/user_ldap/l10n/sl.php23
-rw-r--r--apps/user_ldap/l10n/th_TH.php35
-rw-r--r--apps/user_migrate/l10n/ca.php4
-rw-r--r--apps/user_migrate/l10n/cs_CZ.php10
-rw-r--r--apps/user_migrate/l10n/de.php10
-rw-r--r--apps/user_migrate/l10n/eo.php10
-rw-r--r--apps/user_migrate/l10n/fi_FI.php9
-rw-r--r--apps/user_migrate/l10n/fr.php10
-rw-r--r--apps/user_migrate/l10n/it.php10
-rw-r--r--apps/user_migrate/l10n/ja_JP.php10
-rw-r--r--apps/user_migrate/l10n/sl.php10
-rw-r--r--apps/user_migrate/l10n/th_TH.php10
-rw-r--r--apps/user_openid/l10n/cs_CZ.php11
-rw-r--r--apps/user_openid/l10n/de.php11
-rw-r--r--apps/user_openid/l10n/eo.php11
-rw-r--r--apps/user_openid/l10n/et_EE.php5
-rw-r--r--apps/user_openid/l10n/fr.php11
-rw-r--r--apps/user_openid/l10n/it.php11
-rw-r--r--apps/user_openid/l10n/ja_JP.php11
-rw-r--r--apps/user_openid/l10n/sl.php11
-rw-r--r--apps/user_openid/l10n/th_TH.php11
-rw-r--r--apps/user_webfinger/webfinger.php12
-rw-r--r--core/img/actions/add.pngbin488 -> 441 bytes
-rw-r--r--core/img/actions/delete.pngbin275 -> 240 bytes
-rw-r--r--core/img/actions/download.pngbin246 -> 236 bytes
-rw-r--r--core/img/actions/history.pngbin370 -> 363 bytes
-rw-r--r--core/img/actions/info.pngbin474 -> 423 bytes
-rw-r--r--core/img/actions/logout.pngbin657 -> 592 bytes
-rw-r--r--core/img/actions/mail.pngbin463 -> 405 bytes
-rw-r--r--core/img/actions/pause-big.pngbin183 -> 166 bytes
-rw-r--r--core/img/actions/pause.pngbin182 -> 170 bytes
-rw-r--r--core/img/actions/play-add.pngbin275 -> 237 bytes
-rw-r--r--core/img/actions/play-big.pngbin212 -> 210 bytes
-rw-r--r--core/img/actions/play-next.pngbin253 -> 224 bytes
-rw-r--r--core/img/actions/play-previous.pngbin260 -> 237 bytes
-rw-r--r--core/img/actions/play.pngbin220 -> 201 bytes
-rw-r--r--core/img/actions/public.pngbin459 -> 412 bytes
-rw-r--r--core/img/actions/rename.pngbin310 -> 267 bytes
-rw-r--r--core/img/actions/search.pngbin701 -> 554 bytes
-rw-r--r--core/img/actions/settings.pngbin883 -> 683 bytes
-rw-r--r--core/img/actions/share.pngbin377 -> 338 bytes
-rw-r--r--core/img/actions/shared.pngbin437 -> 364 bytes
-rw-r--r--core/img/actions/sound-off.pngbin217 -> 192 bytes
-rw-r--r--core/img/actions/sound.pngbin292 -> 254 bytes
-rw-r--r--core/img/actions/triangle-s.pngbin526 -> 515 bytes
-rw-r--r--core/img/actions/upload-white.pngbin228 -> 226 bytes
-rw-r--r--core/img/actions/upload.pngbin236 -> 235 bytes
-rw-r--r--core/img/breadcrumb-start.pngbin452 -> 311 bytes
-rw-r--r--core/img/breadcrumb.pngbin452 -> 320 bytes
-rw-r--r--core/img/favicon-touch.pngbin5703 -> 3705 bytes
-rw-r--r--core/img/favicon.pngbin1231 -> 912 bytes
-rw-r--r--core/img/filetypes/application-msword.pngbin28346 -> 789 bytes
-rw-r--r--core/img/filetypes/application-sgf.pngbin725 -> 702 bytes
-rw-r--r--core/img/filetypes/application-vnd.oasis.opendocument.formula.pngbin580 -> 479 bytes
-rw-r--r--core/img/filetypes/application-vnd.oasis.opendocument.graphics.pngbin572 -> 475 bytes
-rw-r--r--core/img/filetypes/application-vnd.oasis.opendocument.presentation.pngbin441 -> 333 bytes
-rw-r--r--core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.pngbin436 -> 344 bytes
-rw-r--r--core/img/filetypes/application-vnd.oasis.opendocument.text.pngbin420 -> 347 bytes
-rw-r--r--core/img/filetypes/application-x-7z-compressed.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-bzip-compressed-tar.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-bzip.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-compressed-tar.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-deb.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-debian-package.pngbin570 -> 548 bytes
-rw-r--r--core/img/filetypes/application-x-gzip.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-lzma-compressed-tar.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-rar.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-rpm.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-tar.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-x-tarz.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/application-zip.pngbin652 -> 650 bytes
-rw-r--r--core/img/filetypes/flash.pngbin582 -> 580 bytes
-rw-r--r--core/img/icon-error.pngbin1573 -> 1344 bytes
-rw-r--r--core/img/icon-sync.pngbin1577 -> 1271 bytes
-rw-r--r--core/img/icon.pngbin1344 -> 1109 bytes
-rw-r--r--core/img/logo-inverted.pngbin8116 -> 5938 bytes
-rw-r--r--core/img/logo-square.pngbin22792 -> 16048 bytes
-rw-r--r--core/img/logo-wide.pngbin2293 -> 1908 bytes
-rw-r--r--core/img/logo.pngbin7356 -> 5860 bytes
-rw-r--r--core/img/places/file.pngbin391 -> 364 bytes
-rw-r--r--core/img/places/folder.pngbin386 -> 339 bytes
-rw-r--r--core/img/places/home.pngbin416 -> 372 bytes
-rw-r--r--core/img/places/music.pngbin561 -> 532 bytes
-rw-r--r--core/img/places/picture.pngbin307 -> 300 bytes
-rw-r--r--core/img/remoteStorage-big.pngbin9742 -> 8997 bytes
-rw-r--r--core/js/js.js5
-rw-r--r--core/js/share.js4
-rw-r--r--l10n/af/contacts.po18
-rw-r--r--l10n/af/settings.po8
-rw-r--r--l10n/ar/contacts.po18
-rw-r--r--l10n/ar/settings.po8
-rw-r--r--l10n/ar_SA/contacts.po18
-rw-r--r--l10n/ar_SA/settings.po8
-rw-r--r--l10n/bg_BG/contacts.po18
-rw-r--r--l10n/bg_BG/settings.po8
-rw-r--r--l10n/ca/contacts.po16
-rw-r--r--l10n/ca/settings.po18
-rw-r--r--l10n/ca/user_migrate.po8
-rw-r--r--l10n/cs_CZ/admin_dependencies_chk.po31
-rw-r--r--l10n/cs_CZ/admin_migrate.po13
-rw-r--r--l10n/cs_CZ/bookmarks.po27
-rw-r--r--l10n/cs_CZ/calendar.po90
-rw-r--r--l10n/cs_CZ/contacts.po112
-rw-r--r--l10n/cs_CZ/files.po34
-rw-r--r--l10n/cs_CZ/files_encryption.po15
-rw-r--r--l10n/cs_CZ/files_sharing.po25
-rw-r--r--l10n/cs_CZ/files_versions.po11
-rw-r--r--l10n/cs_CZ/gallery.po84
-rw-r--r--l10n/cs_CZ/lib.po65
-rw-r--r--l10n/cs_CZ/settings.po24
-rw-r--r--l10n/cs_CZ/user_ldap.po75
-rw-r--r--l10n/cs_CZ/user_migrate.po23
-rw-r--r--l10n/cs_CZ/user_openid.po25
-rw-r--r--l10n/da/contacts.po18
-rw-r--r--l10n/da/settings.po10
-rw-r--r--l10n/de/admin_dependencies_chk.po33
-rw-r--r--l10n/de/admin_migrate.po14
-rw-r--r--l10n/de/calendar.po8
-rw-r--r--l10n/de/contacts.po84
-rw-r--r--l10n/de/files_external.po39
-rw-r--r--l10n/de/files_sharing.po26
-rw-r--r--l10n/de/files_versions.po11
-rw-r--r--l10n/de/settings.po18
-rw-r--r--l10n/de/tasks.po52
-rw-r--r--l10n/de/user_ldap.po44
-rw-r--r--l10n/de/user_migrate.po24
-rw-r--r--l10n/de/user_openid.po26
-rw-r--r--l10n/el/contacts.po33
-rw-r--r--l10n/el/settings.po23
-rw-r--r--l10n/eo/admin_dependencies_chk.po31
-rw-r--r--l10n/eo/admin_migrate.po13
-rw-r--r--l10n/eo/calendar.po20
-rw-r--r--l10n/eo/contacts.po36
-rw-r--r--l10n/eo/core.po33
-rw-r--r--l10n/eo/files_encryption.po15
-rw-r--r--l10n/eo/files_external.po39
-rw-r--r--l10n/eo/files_sharing.po25
-rw-r--r--l10n/eo/files_versions.po11
-rw-r--r--l10n/eo/media.po19
-rw-r--r--l10n/eo/settings.po20
-rw-r--r--l10n/eo/tasks.po51
-rw-r--r--l10n/eo/user_ldap.po67
-rw-r--r--l10n/eo/user_migrate.po23
-rw-r--r--l10n/eo/user_openid.po25
-rw-r--r--l10n/es/contacts.po18
-rw-r--r--l10n/es/settings.po18
-rw-r--r--l10n/es/tasks.po51
-rw-r--r--l10n/et_EE/admin_dependencies_chk.po31
-rw-r--r--l10n/et_EE/admin_migrate.po13
-rw-r--r--l10n/et_EE/contacts.po18
-rw-r--r--l10n/et_EE/files_encryption.po15
-rw-r--r--l10n/et_EE/files_external.po27
-rw-r--r--l10n/et_EE/files_sharing.po25
-rw-r--r--l10n/et_EE/files_versions.po11
-rw-r--r--l10n/et_EE/settings.po8
-rw-r--r--l10n/et_EE/tasks.po51
-rw-r--r--l10n/et_EE/user_openid.po13
-rw-r--r--l10n/eu/contacts.po18
-rw-r--r--l10n/eu/settings.po10
-rw-r--r--l10n/eu_ES/contacts.po18
-rw-r--r--l10n/eu_ES/settings.po8
-rw-r--r--l10n/fa/contacts.po18
-rw-r--r--l10n/fa/settings.po8
-rw-r--r--l10n/fi/contacts.po18
-rw-r--r--l10n/fi/settings.po8
-rw-r--r--l10n/fi_FI/admin_migrate.po11
-rw-r--r--l10n/fi_FI/contacts.po18
-rw-r--r--l10n/fi_FI/files_encryption.po15
-rw-r--r--l10n/fi_FI/files_external.po35
-rw-r--r--l10n/fi_FI/files_sharing.po21
-rw-r--r--l10n/fi_FI/files_versions.po11
-rw-r--r--l10n/fi_FI/settings.po12
-rw-r--r--l10n/fi_FI/tasks.po31
-rw-r--r--l10n/fi_FI/user_migrate.po21
-rw-r--r--l10n/fr/admin_dependencies_chk.po31
-rw-r--r--l10n/fr/admin_migrate.po13
-rw-r--r--l10n/fr/contacts.po20
-rw-r--r--l10n/fr/files_encryption.po15
-rw-r--r--l10n/fr/files_external.po39
-rw-r--r--l10n/fr/files_sharing.po25
-rw-r--r--l10n/fr/files_versions.po11
-rw-r--r--l10n/fr/settings.po18
-rw-r--r--l10n/fr/tasks.po52
-rw-r--r--l10n/fr/user_ldap.po63
-rw-r--r--l10n/fr/user_migrate.po23
-rw-r--r--l10n/fr/user_openid.po25
-rw-r--r--l10n/gl/contacts.po18
-rw-r--r--l10n/gl/settings.po24
-rw-r--r--l10n/he/contacts.po18
-rw-r--r--l10n/he/settings.po8
-rw-r--r--l10n/hr/contacts.po18
-rw-r--r--l10n/hr/settings.po8
-rw-r--r--l10n/hu_HU/contacts.po18
-rw-r--r--l10n/hu_HU/settings.po10
-rw-r--r--l10n/hy/contacts.po18
-rw-r--r--l10n/hy/settings.po8
-rw-r--r--l10n/ia/contacts.po18
-rw-r--r--l10n/ia/settings.po8
-rw-r--r--l10n/id/contacts.po18
-rw-r--r--l10n/id/settings.po8
-rw-r--r--l10n/id_ID/contacts.po18
-rw-r--r--l10n/id_ID/settings.po8
-rw-r--r--l10n/it/admin_dependencies_chk.po31
-rw-r--r--l10n/it/admin_migrate.po13
-rw-r--r--l10n/it/contacts.po16
-rw-r--r--l10n/it/files_encryption.po15
-rw-r--r--l10n/it/files_external.po40
-rw-r--r--l10n/it/files_sharing.po25
-rw-r--r--l10n/it/files_versions.po11
-rw-r--r--l10n/it/settings.po16
-rw-r--r--l10n/it/tasks.po51
-rw-r--r--l10n/it/user_ldap.po76
-rw-r--r--l10n/it/user_migrate.po23
-rw-r--r--l10n/it/user_openid.po25
-rw-r--r--l10n/ja_JP/admin_dependencies_chk.po31
-rw-r--r--l10n/ja_JP/admin_migrate.po13
-rw-r--r--l10n/ja_JP/calendar.po21
-rw-r--r--l10n/ja_JP/contacts.po63
-rw-r--r--l10n/ja_JP/files_encryption.po15
-rw-r--r--l10n/ja_JP/files_external.po39
-rw-r--r--l10n/ja_JP/files_sharing.po26
-rw-r--r--l10n/ja_JP/files_versions.po11
-rw-r--r--l10n/ja_JP/settings.po19
-rw-r--r--l10n/ja_JP/tasks.po52
-rw-r--r--l10n/ja_JP/user_ldap.po76
-rw-r--r--l10n/ja_JP/user_migrate.po23
-rw-r--r--l10n/ja_JP/user_openid.po25
-rw-r--r--l10n/ko/contacts.po18
-rw-r--r--l10n/ko/settings.po8
-rw-r--r--l10n/lb/contacts.po18
-rw-r--r--l10n/lb/settings.po8
-rw-r--r--l10n/lt_LT/contacts.po18
-rw-r--r--l10n/lt_LT/settings.po8
-rw-r--r--l10n/lv/contacts.po18
-rw-r--r--l10n/lv/settings.po8
-rw-r--r--l10n/mk/contacts.po18
-rw-r--r--l10n/mk/settings.po8
-rw-r--r--l10n/ms_MY/contacts.po18
-rw-r--r--l10n/ms_MY/settings.po10
-rw-r--r--l10n/nb_NO/contacts.po18
-rw-r--r--l10n/nb_NO/settings.po8
-rw-r--r--l10n/nl/contacts.po18
-rw-r--r--l10n/nl/settings.po8
-rw-r--r--l10n/nn_NO/contacts.po18
-rw-r--r--l10n/nn_NO/settings.po8
-rw-r--r--l10n/pl/contacts.po18
-rw-r--r--l10n/pl/settings.po16
-rw-r--r--l10n/pt_BR/contacts.po18
-rw-r--r--l10n/pt_BR/settings.po8
-rw-r--r--l10n/pt_PT/contacts.po18
-rw-r--r--l10n/pt_PT/settings.po8
-rw-r--r--l10n/ro/contacts.po18
-rw-r--r--l10n/ro/settings.po8
-rw-r--r--l10n/ro/tasks.po51
-rw-r--r--l10n/ro/user_ldap.po75
-rw-r--r--l10n/ru/calendar.po37
-rw-r--r--l10n/ru/contacts.po18
-rw-r--r--l10n/ru/settings.po23
-rw-r--r--l10n/sk_SK/contacts.po18
-rw-r--r--l10n/sk_SK/settings.po8
-rw-r--r--l10n/sl/admin_dependencies_chk.po31
-rw-r--r--l10n/sl/admin_migrate.po13
-rw-r--r--l10n/sl/calendar.po90
-rw-r--r--l10n/sl/contacts.po114
-rw-r--r--l10n/sl/files.po28
-rw-r--r--l10n/sl/files_encryption.po15
-rw-r--r--l10n/sl/files_external.po39
-rw-r--r--l10n/sl/files_sharing.po25
-rw-r--r--l10n/sl/files_versions.po11
-rw-r--r--l10n/sl/lib.po22
-rw-r--r--l10n/sl/settings.po22
-rw-r--r--l10n/sl/tasks.po39
-rw-r--r--l10n/sl/user_ldap.po49
-rw-r--r--l10n/sl/user_migrate.po23
-rw-r--r--l10n/sl/user_openid.po25
-rw-r--r--l10n/so/contacts.po18
-rw-r--r--l10n/so/settings.po8
-rw-r--r--l10n/sr/contacts.po18
-rw-r--r--l10n/sr/settings.po8
-rw-r--r--l10n/sr@latin/contacts.po18
-rw-r--r--l10n/sr@latin/settings.po8
-rw-r--r--l10n/sv/contacts.po22
-rw-r--r--l10n/sv/settings.po18
-rw-r--r--l10n/templates/admin_dependencies_chk.pot2
-rw-r--r--l10n/templates/admin_migrate.pot2
-rw-r--r--l10n/templates/bookmarks.pot2
-rw-r--r--l10n/templates/calendar.pot2
-rw-r--r--l10n/templates/contacts.pot80
-rw-r--r--l10n/templates/core.pot26
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/gallery.pot2
-rw-r--r--l10n/templates/lib.pot10
-rw-r--r--l10n/templates/media.pot2
-rw-r--r--l10n/templates/settings.pot4
-rw-r--r--l10n/templates/tasks.pot2
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_migrate.pot2
-rw-r--r--l10n/templates/user_openid.pot2
-rw-r--r--l10n/th_TH/admin_dependencies_chk.po31
-rw-r--r--l10n/th_TH/admin_migrate.po13
-rw-r--r--l10n/th_TH/bookmarks.po27
-rw-r--r--l10n/th_TH/calendar.po90
-rw-r--r--l10n/th_TH/contacts.po184
-rw-r--r--l10n/th_TH/files.po34
-rw-r--r--l10n/th_TH/files_encryption.po15
-rw-r--r--l10n/th_TH/files_external.po39
-rw-r--r--l10n/th_TH/files_sharing.po25
-rw-r--r--l10n/th_TH/files_versions.po11
-rw-r--r--l10n/th_TH/gallery.po84
-rw-r--r--l10n/th_TH/lib.po65
-rw-r--r--l10n/th_TH/settings.po26
-rw-r--r--l10n/th_TH/tasks.po51
-rw-r--r--l10n/th_TH/user_ldap.po73
-rw-r--r--l10n/th_TH/user_migrate.po23
-rw-r--r--l10n/th_TH/user_openid.po25
-rw-r--r--l10n/tr/contacts.po18
-rw-r--r--l10n/tr/settings.po10
-rw-r--r--l10n/uk/contacts.po18
-rw-r--r--l10n/uk/settings.po8
-rw-r--r--l10n/vi/contacts.po18
-rw-r--r--l10n/vi/settings.po8
-rw-r--r--l10n/zh_CN.GB2312/contacts.po18
-rw-r--r--l10n/zh_CN.GB2312/settings.po10
-rw-r--r--l10n/zh_CN/contacts.po18
-rw-r--r--l10n/zh_CN/files.po33
-rw-r--r--l10n/zh_CN/gallery.po85
-rw-r--r--l10n/zh_CN/settings.po24
-rw-r--r--l10n/zh_TW/contacts.po18
-rw-r--r--l10n/zh_TW/settings.po8
-rw-r--r--lib/archive.php21
-rw-r--r--lib/archive/tar.php13
-rw-r--r--lib/archive/zip.php2
-rw-r--r--lib/files.php4
-rw-r--r--lib/filestorage.php1
-rw-r--r--lib/filestorage/common.php20
-rw-r--r--lib/filestorage/local.php5
-rw-r--r--lib/filesystem.php20
-rw-r--r--lib/filesystemview.php128
-rw-r--r--lib/l10n/cs_CZ.php25
-rw-r--r--lib/l10n/sl.php5
-rw-r--r--lib/l10n/th_TH.php25
-rw-r--r--lib/mimetypes.list.php1
-rw-r--r--settings/ajax/apps/ocs.php2
-rw-r--r--settings/img/admin.pngbin302 -> 224 bytes
-rw-r--r--settings/img/apps.pngbin255 -> 229 bytes
-rw-r--r--settings/img/help.pngbin474 -> 423 bytes
-rw-r--r--settings/img/log.pngbin441 -> 342 bytes
-rw-r--r--settings/img/personal.pngbin589 -> 504 bytes
-rw-r--r--settings/img/users.pngbin743 -> 639 bytes
-rw-r--r--settings/js/users.js2
-rw-r--r--settings/l10n/ca.php6
-rw-r--r--settings/l10n/cs_CZ.php8
-rw-r--r--settings/l10n/da.php1
-rw-r--r--settings/l10n/de.php6
-rw-r--r--settings/l10n/el.php7
-rw-r--r--settings/l10n/eo.php8
-rw-r--r--settings/l10n/es.php5
-rw-r--r--settings/l10n/eu.php1
-rw-r--r--settings/l10n/fi_FI.php2
-rw-r--r--settings/l10n/fr.php5
-rw-r--r--settings/l10n/gl.php8
-rw-r--r--settings/l10n/hu_HU.php1
-rw-r--r--settings/l10n/it.php5
-rw-r--r--settings/l10n/ja_JP.php5
-rw-r--r--settings/l10n/ms_MY.php1
-rw-r--r--settings/l10n/pl.php4
-rw-r--r--settings/l10n/ru.php7
-rw-r--r--settings/l10n/sl.php8
-rw-r--r--settings/l10n/sv.php6
-rw-r--r--settings/l10n/th_TH.php9
-rw-r--r--settings/l10n/tr.php1
-rw-r--r--settings/l10n/zh_CN.GB2312.php1
-rw-r--r--settings/l10n/zh_CN.php8
-rw-r--r--settings/templates/users.php4
-rw-r--r--settings/trans.pngbin187 -> 185 bytes
-rw-r--r--tests/data/logo-wide.pngbin3559 -> 2882 bytes
-rw-r--r--tests/lib/archive.php8
-rw-r--r--tests/lib/filestorage.php15
-rw-r--r--tests/lib/filesystem.php1
525 files changed, 5256 insertions, 3162 deletions
diff --git a/apps/admin_dependencies_chk/l10n/cs_CZ.php b/apps/admin_dependencies_chk/l10n/cs_CZ.php
new file mode 100644
index 00000000000..f750f13aefc
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/cs_CZ.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modul php-json je třeba pro vzájemnou komunikaci mnoha aplikací",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modul php-curl je třeba pro zobrazení titulu strany v okamžiku přidání záložky",
+"The php-gd module is needed to create thumbnails of your images" => "Modul php-gd je třeba pro tvorbu náhledů Vašich obrázků",
+"The php-ldap module is needed connect to your ldap server" => "Modul php-ldap je třeba pro připojení na Váš ldap server",
+"The php-zip module is needed download multiple files at once" => "Modul php-zip je třeba pro souběžné stahování souborů",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modul php-mb_multibyte je třeba pro správnou funkci kódování.",
+"The php-ctype module is needed validate data." => "Modul php-ctype je třeba k ověřování dat.",
+"The php-xml module is needed to share files with webdav." => "Modul php-xml je třeba ke sdílení souborů prostřednictvím WebDAV.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Příkaz allow_url_fopen ve Vašem php.ini souboru by měl být nastaven na 1 kvůli získávání informací z OCS serverů",
+"The php-pdo module is needed to store owncloud data into a database." => "Modul php-pdo je třeba pro ukládání dat ownCloud do databáze",
+"Dependencies status" => "Status závislostí",
+"Used by :" => "Používáno:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/de.php b/apps/admin_dependencies_chk/l10n/de.php
new file mode 100644
index 00000000000..01609168098
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/de.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Das Modul php-json wird von vielen Anwendungen zur internen Kommunikation benötigt.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen.",
+"The php-gd module is needed to create thumbnails of your images" => "Das Modul php-gd wird für die Erzeugung der Vorschaubilder benötigt.",
+"The php-ldap module is needed connect to your ldap server" => "Das Modul php-ldap wird für die Verbindung mit dem LDAP-Server benötigt.",
+"The php-zip module is needed download multiple files at once" => "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Das Modul php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben.",
+"The php-ctype module is needed validate data." => "Das Modul php-ctype wird benötigt, um Daten zu prüfen.",
+"The php-xml module is needed to share files with webdav." => "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen.",
+"The php-pdo module is needed to store owncloud data into a database." => "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern.",
+"Dependencies status" => "Status der Abhängigkeiten",
+"Used by :" => "Benutzt von:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/eo.php b/apps/admin_dependencies_chk/l10n/eo.php
new file mode 100644
index 00000000000..65896831f7b
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/eo.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "La modulo php-json necesas por komuniko inter la multaj aplikaĵoj",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "La modulo php-curl necesas por venigi la paĝotitolon dum aldono de legosigno",
+"The php-gd module is needed to create thumbnails of your images" => "La modulo php-gd necesas por krei bildetojn.",
+"The php-ldap module is needed connect to your ldap server" => "La modulo php-ldap necesas por konekti al via LDAP-servilo.",
+"The php-zip module is needed download multiple files at once" => "La modulo php-zip necesas por elŝuti plurajn dosierojn per unu fojo.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "La modulo php-mb_multibyte necesas por ĝuste administri la kodprezenton.",
+"The php-ctype module is needed validate data." => "La modulo php-ctype necesas por validkontroli datumojn.",
+"The php-xml module is needed to share files with webdav." => "La modulo php-xml necesas por kunhavigi dosierojn per WebDAV.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La ordono allow_url_fopen de via php.ini devus valori 1 por ricevi scibazon el OCS-serviloj",
+"The php-pdo module is needed to store owncloud data into a database." => "La modulo php-pdo necesas por konservi datumojn de ownCloud en datumbazo.",
+"Dependencies status" => "Stato de dependoj",
+"Used by :" => "Uzata de:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/et_EE.php b/apps/admin_dependencies_chk/l10n/et_EE.php
new file mode 100644
index 00000000000..529c8e78d1a
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/et_EE.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "php-json moodul on vajalik paljude rakenduse poolt omvahelise suhtlemise jaoks",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "php-curl moodul on vajalik lehe pealkirja tõmbamiseks järjehoidja lisamisel",
+"The php-gd module is needed to create thumbnails of your images" => "php-gd moodul on vajalik sinu piltidest pisipiltide loomiseks",
+"The php-ldap module is needed connect to your ldap server" => "php-ldap moodul on vajalik sinu ldap serveriga ühendumiseks",
+"The php-zip module is needed download multiple files at once" => "php-zip moodul on vajalik mitme faili korraga alla laadimiseks",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "php-mb_multibyte moodul on vajalik kodeerimise korrektseks haldamiseks.",
+"The php-ctype module is needed validate data." => "php-ctype moodul on vajalik andmete kontrollimiseks.",
+"The php-xml module is needed to share files with webdav." => "php-xml moodul on vajalik failide jagamiseks webdav-iga.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Sinu php.ini failis oleva direktiivi allow_url_fopen väärtuseks peaks määrama 1, et saaks tõmmata teadmistebaasi OCS-i serveritest",
+"The php-pdo module is needed to store owncloud data into a database." => "php-pdo moodul on vajalik owncloudi andmete salvestamiseks andmebaasi.",
+"Dependencies status" => "Sõltuvuse staatus",
+"Used by :" => "Kasutab :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/fr.php b/apps/admin_dependencies_chk/l10n/fr.php
new file mode 100644
index 00000000000..1b195b78bb4
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/fr.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Le module php-json est requis pour l'inter-communication de nombreux modules.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages.",
+"The php-gd module is needed to create thumbnails of your images" => "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images.",
+"The php-ldap module is needed connect to your ldap server" => "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap.",
+"The php-zip module is needed download multiple files at once" => "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Le module php-mb_multibyte est requis pour une gestion correcte des encodages.",
+"The php-ctype module is needed validate data." => "Le module php-ctype est requis pour la validation des données.",
+"The php-xml module is needed to share files with webdav." => "Le module php-xml est requis pour le partage de fichiers via webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS.",
+"The php-pdo module is needed to store owncloud data into a database." => "le module php-pdo est requis pour le stockage des données ownCloud en base de données.",
+"Dependencies status" => "Statut des dépendances",
+"Used by :" => "Utilisé par :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/it.php b/apps/admin_dependencies_chk/l10n/it.php
new file mode 100644
index 00000000000..f51286966e1
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/it.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro",
+"The php-gd module is needed to create thumbnails of your images" => "Il modulo php-gd è richiesto per creare miniature delle tue immagini",
+"The php-ldap module is needed connect to your ldap server" => "Il modulo php-ldap è richiesto per collegarsi a un server ldap",
+"The php-zip module is needed download multiple files at once" => "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica.",
+"The php-ctype module is needed validate data." => "Il modulo php-ctype è richiesto per la validazione dei dati.",
+"The php-xml module is needed to share files with webdav." => "Il modulo php-xml è richiesto per condividere i file con webdav.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "La direttiva allow_url_fopen del tuo php.ini deve essere impostata a 1 per recuperare la base di conoscenza dai server di OCS",
+"The php-pdo module is needed to store owncloud data into a database." => "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database.",
+"Dependencies status" => "Stato delle dipendenze",
+"Used by :" => "Usato da:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/ja_JP.php b/apps/admin_dependencies_chk/l10n/ja_JP.php
new file mode 100644
index 00000000000..0770b92db15
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/ja_JP.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "php-jsonモジュールはアプリケーション間の内部通信に必要です",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "php-curlモジュールはブックマーク追加時のページタイトル取得に必要です",
+"The php-gd module is needed to create thumbnails of your images" => "php-gdモジュールはサムネイル画像の生成に必要です",
+"The php-ldap module is needed connect to your ldap server" => "php-ldapモジュールはLDAPサーバへの接続に必要です",
+"The php-zip module is needed download multiple files at once" => "php-zipモジュールは複数ファイルの同時ダウンロードに必要です",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "php-mb_multibyteモジュールはエンコードを正しく扱うために必要です",
+"The php-ctype module is needed validate data." => "php-ctypeモジュールはデータのバリデーションに必要です",
+"The php-xml module is needed to share files with webdav." => "php-xmlモジュールはWebDAVでのファイル共有に必要です",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "php.iniのallow_url_fopenはOCSサーバから知識ベースを取得するために1に設定しなくてはなりません",
+"The php-pdo module is needed to store owncloud data into a database." => "php-pdoモジュールはデータベースにownCloudのデータを格納するために必要です",
+"Dependencies status" => "依存関係の状況",
+"Used by :" => "利用先 :"
+);
diff --git a/apps/admin_dependencies_chk/l10n/sl.php b/apps/admin_dependencies_chk/l10n/sl.php
new file mode 100644
index 00000000000..0d36aa379ce
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/sl.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modul php-json je potreben za medsebojno komunikacijo veliko aplikacij.",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modul php-curl je potreben za pridobivanje naslova strani pri dodajanju zaznamkov.",
+"The php-gd module is needed to create thumbnails of your images" => "Modul php-gd je potreben za ustvarjanje sličic za predogled.",
+"The php-ldap module is needed connect to your ldap server" => "Modul php-ldap je potreben za povezavo z vašim ldap strežnikom.",
+"The php-zip module is needed download multiple files at once" => "Modul php-zip je potreben za prenašanje večih datotek hkrati.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modul php-mb_multibyte je potreben za pravilno upravljanje kodiranja.",
+"The php-ctype module is needed validate data." => "Modul php-ctype je potreben za preverjanje veljavnosti podatkov.",
+"The php-xml module is needed to share files with webdav." => "Modul php-xml je potreben za izmenjavo datotek preko protokola WebDAV.",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "Direktiva allow_url_fopen v vaši php.ini datoteki mora biti nastavljena na 1, če želite omogočiti dostop do zbirke znanja na strežnikih OCS.",
+"The php-pdo module is needed to store owncloud data into a database." => "Modul php-pdo je potreben za shranjevanje ownCloud podatkov v podatkovno zbirko.",
+"Dependencies status" => "Stanje odvisnosti",
+"Used by :" => "Uporablja:"
+);
diff --git a/apps/admin_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
new file mode 100644
index 00000000000..01d5c36366d
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/th_TH.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "โมดูล php-json จำเป็นต้องใช้สำหรับแอพพลิเคชั่นหลายๆตัวเพื่อการเชื่อมต่อสากล",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "โมดูล php-curl จำเป็นต้องใช้สำหรับดึงข้อมูลชื่อหัวเว็บเมื่อเพิ่มเข้าไปยังรายการโปรด",
+"The php-gd module is needed to create thumbnails of your images" => "โมดูล php-gd จำเป็นต้องใช้สำหรับสร้างรูปภาพขนาดย่อของรูปภาพของคุณ",
+"The php-ldap module is needed connect to your ldap server" => "โมดูล php-ldap จำเป็นต้องใช้สำหรับการเชื่อมต่อกับเซิร์ฟเวอร์ ldap ของคุณ",
+"The php-zip module is needed download multiple files at once" => "โมดูล php-zip จำเป็นต้องใช้สำหรับดาวน์โหลดไฟล์พร้อมกันหลายๆไฟล์ในครั้งเดียว",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "โมดูล php-mb_multibyte จำเป็นต้องใช้สำหรับการจัดการการแปลงรหัสไฟล์อย่างถูกต้อง",
+"The php-ctype module is needed validate data." => "โมดูล php-ctype จำเป็นต้องใช้สำหรับตรวจสอบความถูกต้องของข้อมูล",
+"The php-xml module is needed to share files with webdav." => "โมดูล php-xml จำเป็นต้องใช้สำหรับแชร์ไฟล์ด้วย webdav",
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers" => "คำสั่ง allow_url_fopen ที่อยู่ในไฟล์ php.ini ของคุณ ควรกำหนดเป็น 1 เพื่อดึงข้อมูลของฐานความรู้ต่างๆจากเซิร์ฟเวอร์ของ OCS",
+"The php-pdo module is needed to store owncloud data into a database." => "โมดูล php-pdo จำเป็นต้องใช้สำหรับจัดเก็บข้อมูลใน owncloud เข้าไปไว้ยังฐานข้อมูล",
+"Dependencies status" => "สถานะการอ้างอิง",
+"Used by :" => "ใช้งานโดย:"
+);
diff --git a/apps/admin_migrate/l10n/cs_CZ.php b/apps/admin_migrate/l10n/cs_CZ.php
new file mode 100644
index 00000000000..0dc1a61d5d8
--- /dev/null
+++ b/apps/admin_migrate/l10n/cs_CZ.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Export této instance ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "Bude vytvořen komprimovaný soubor obsahující data této instance ownCloud.⏎ Zvolte typ exportu:",
+"Export" => "Export"
+);
diff --git a/apps/admin_migrate/l10n/de.php b/apps/admin_migrate/l10n/de.php
new file mode 100644
index 00000000000..d42179b75ad
--- /dev/null
+++ b/apps/admin_migrate/l10n/de.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Diese ownCloud-Instanz exportieren.",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n Bitte wählen Sie den Exporttyp:",
+"Export" => "Exportieren"
+);
diff --git a/apps/admin_migrate/l10n/eo.php b/apps/admin_migrate/l10n/eo.php
new file mode 100644
index 00000000000..a37be76425b
--- /dev/null
+++ b/apps/admin_migrate/l10n/eo.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Malenporti ĉi tiun aperon de ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "Ĉi tio kreos densigitan dosieron, kiu enhavos la datumojn de ĉi tiu apero de ownCloud.\nBonvolu elekti la tipon de malenportado:",
+"Export" => "Malenporti"
+);
diff --git a/apps/admin_migrate/l10n/et_EE.php b/apps/admin_migrate/l10n/et_EE.php
new file mode 100644
index 00000000000..ee92f9fe217
--- /dev/null
+++ b/apps/admin_migrate/l10n/et_EE.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Ekspordi see ownCloudi paigaldus",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "See loob pakitud faili, milles on sinu owncloudi paigalduse andmed.\n Palun vali eksporditava faili tüüp:",
+"Export" => "Ekspordi"
+);
diff --git a/apps/admin_migrate/l10n/fi_FI.php b/apps/admin_migrate/l10n/fi_FI.php
new file mode 100644
index 00000000000..2484eab7d33
--- /dev/null
+++ b/apps/admin_migrate/l10n/fi_FI.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Vie tämä ownCloud-istanssi",
+"Export" => "Vie"
+);
diff --git a/apps/admin_migrate/l10n/fr.php b/apps/admin_migrate/l10n/fr.php
new file mode 100644
index 00000000000..0cf0a444b0e
--- /dev/null
+++ b/apps/admin_migrate/l10n/fr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporter cette instance ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n Veuillez choisir le type d'export :",
+"Export" => "Exporter"
+);
diff --git a/apps/admin_migrate/l10n/it.php b/apps/admin_migrate/l10n/it.php
new file mode 100644
index 00000000000..94ba191ba6e
--- /dev/null
+++ b/apps/admin_migrate/l10n/it.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Esporta questa istanza di ownCloud",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:",
+"Export" => "Esporta"
+);
diff --git a/apps/admin_migrate/l10n/ja_JP.php b/apps/admin_migrate/l10n/ja_JP.php
new file mode 100644
index 00000000000..f8e5944a6a4
--- /dev/null
+++ b/apps/admin_migrate/l10n/ja_JP.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "ownCloudをエクスポート",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "このownCloudのデータを含む圧縮ファイルを生成します。\nエクスポートの種類を選択してください:",
+"Export" => "エクスポート"
+);
diff --git a/apps/admin_migrate/l10n/sl.php b/apps/admin_migrate/l10n/sl.php
new file mode 100644
index 00000000000..b8d1118bfe2
--- /dev/null
+++ b/apps/admin_migrate/l10n/sl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Izvozi to ownCloud namestitev",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "Ustvarjena bo stisnjena datoteka s podatki te ownCloud namestitve.\n Prosimo, če izberete vrsto izvoza:",
+"Export" => "Izvozi"
+);
diff --git a/apps/admin_migrate/l10n/th_TH.php b/apps/admin_migrate/l10n/th_TH.php
new file mode 100644
index 00000000000..9dfaca15b5e
--- /dev/null
+++ b/apps/admin_migrate/l10n/th_TH.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้",
+"This will create a compressed file that contains the data of this owncloud instance.\n Please choose the export type:" => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n กรุณาเลือกชนิดของการส่งออกข้อมูล:",
+"Export" => "ส่งออก"
+);
diff --git a/apps/bookmarks/img/bookmarks.png b/apps/bookmarks/img/bookmarks.png
index b92e4f50a42..3e8eed2380f 100644
--- a/apps/bookmarks/img/bookmarks.png
+++ b/apps/bookmarks/img/bookmarks.png
Binary files differ
diff --git a/apps/bookmarks/l10n/cs_CZ.php b/apps/bookmarks/l10n/cs_CZ.php
new file mode 100644
index 00000000000..2251969a26c
--- /dev/null
+++ b/apps/bookmarks/l10n/cs_CZ.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Záložky",
+"unnamed" => "nepojmenovaný",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:",
+"Read later" => "Přečíst později",
+"Address" => "Adresa",
+"Title" => "Název",
+"Tags" => "Tagy",
+"Save bookmark" => "Uložit záložku",
+"You have no bookmarks" => "Nemáte žádné záložky",
+"Bookmarklet <br />" => "Záložky <br />"
+);
diff --git a/apps/bookmarks/l10n/th_TH.php b/apps/bookmarks/l10n/th_TH.php
new file mode 100644
index 00000000000..64a148efabc
--- /dev/null
+++ b/apps/bookmarks/l10n/th_TH.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "รายการโปรด",
+"unnamed" => "ยังไม่มีชื่อ",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
+"Read later" => "อ่านภายหลัง",
+"Address" => "ที่อยู่",
+"Title" => "ชื่อ",
+"Tags" => "ป้ายกำกับ",
+"Save bookmark" => "บันทึกรายการโปรด",
+"You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 6669d7ce2c4..dd605072ce7 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,12 +21,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
$caldavBackend = new OC_Connector_Sabre_CalDAV();
// Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CalDAV_CalendarRootNode = new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend);
+$Sabre_CalDAV_CalendarRootNode->disableListing = true; // Disable listening
$nodes = array(
- $collection,
- new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
+ $Sabre_CalDAV_Principal_Collection,
+ $Sabre_CalDAV_CalendarRootNode,
);
// Fire up server
diff --git a/apps/calendar/css/import.css b/apps/calendar/css/import.css
index 8abdc3aecd1..fd82006072c 100644
--- a/apps/calendar/css/import.css
+++ b/apps/calendar/css/import.css
@@ -11,4 +11,4 @@
#calendar_import_mergewarning{clear: both;}
#calendar_import_defaultcolors{clear:both;margin: 0 auto;text-align: center;}
.calendar_import_warning{border-color: #fc3333;}
-.calendar-colorpicker-color{display:inline-block;width:20px;height:5px;margin: 0 auto;cursor:pointer;border:2px solid transparent;} \ No newline at end of file
+.calendar-colorpicker-color{display:inline-block;width:20px;height:5px;margin: 0 auto;cursor:pointer;border:2px solid transparent;margin-top: 5px;} \ No newline at end of file
diff --git a/apps/calendar/img/icon.png b/apps/calendar/img/icon.png
index eb9e07cbb10..267efd997f3 100644
--- a/apps/calendar/img/icon.png
+++ b/apps/calendar/img/icon.png
Binary files differ
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
index fcc31613c79..ab76cc49d1e 100644
--- a/apps/calendar/l10n/cs_CZ.php
+++ b/apps/calendar/l10n/cs_CZ.php
@@ -1,7 +1,13 @@
<?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "V paměti nejsou uloženy kompletně všechny kalendáře",
+"Everything seems to be completely cached" => "Zdá se, že vše je kompletně uloženo v paměti",
"No calendars found." => "Žádné kalendáře nenalezeny.",
"No events found." => "Žádné události nenalezeny.",
"Wrong calendar" => "Nesprávný kalendář",
+"The file contained either no events or all events are already saved in your calendar." => "Soubor, obsahující všechny záznamy nebo je prázdný, je již uložen ve Vašem kalendáři.",
+"events has been saved in the new calendar" => "Záznam byl uložen v novém kalendáři",
+"Import failed" => "Import selhal",
+"events has been saved in your calendar" => "záznamů bylo uloženo ve Vašem kalendáři",
"New Timezone:" => "Nová časová zóna:",
"Timezone changed" => "Časová zóna byla změněna",
"Invalid request" => "Chybný požadavek",
@@ -27,6 +33,7 @@
"Projects" => "Projekty",
"Questions" => "Dotazy",
"Work" => "Pracovní",
+"by" => "od",
"unnamed" => "nepojmenováno",
"New Calendar" => "Nový kalendář",
"Does not repeat" => "Neopakuje se",
@@ -73,6 +80,25 @@
"by day and month" => "podle dne a měsíce",
"Date" => "Datum",
"Cal." => "Kal.",
+"Sun." => "Ne",
+"Mon." => "Po",
+"Tue." => "Út",
+"Wed." => "St",
+"Thu." => "Čt",
+"Fri." => "Pá",
+"Sat." => "So",
+"Jan." => "Ne",
+"Feb." => "únor",
+"Mar." => "březen",
+"Apr." => "duben",
+"May." => "květen",
+"Jun." => "červen",
+"Jul." => "červenec",
+"Aug." => "srpen",
+"Sep." => "září",
+"Oct." => "říjen",
+"Nov." => "listopad",
+"Dec." => "prosinec",
"All day" => "Celý den",
"Missing fields" => "Chybějící pole",
"Title" => "Název",
@@ -86,6 +112,7 @@
"Month" => "měsíc",
"List" => "Seznam",
"Today" => "dnes",
+"Settings" => "Nastavení",
"Your calendars" => "Vaše kalendáře",
"CalDav Link" => "CalDav odkaz",
"Shared calendars" => "Sdílené kalendáře",
@@ -136,7 +163,10 @@
"occurrences" => "výskyty",
"create a new calendar" => "vytvořit nový kalendář",
"Import a calendar file" => "Importovat soubor kalendáře",
+"Please choose a calendar" => "Vyberte prosím kalendář",
"Name of new calendar" => "Název nového kalendáře",
+"Take an available name!" => "Použijte volné jméno!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Kalendář s trímto názvem již existuje. Pokud název použijete, stejnojmenné kalendáře budou sloučeny.",
"Import" => "Import",
"Close Dialog" => "Zavřít dialog",
"Create a new event" => "Vytvořit novou událost",
@@ -144,9 +174,21 @@
"No categories selected" => "Žádné kategorie nevybrány",
"of" => "z",
"at" => "v",
+"General" => "Hlavní",
"Timezone" => "Časové pásmo",
+"Update timezone automatically" => "Obnovit auronaricky časovou zónu.",
+"Time format" => "Formát času",
"24h" => "24h",
"12h" => "12h",
+"Start week on" => "Týden začína v",
+"Cache" => "Paměť",
+"Clear cache for repeating events" => "Vymazat paměť pro opakuijísí se záznamy",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "Kalendář CalDAV synchronizuje adresy",
+"more info" => "podrobnosti",
+"Primary address (Kontact et al)" => "Primární adresa (veřejná)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Odkaz(y) kalendáře pouze pro čtení",
"Users" => "Uživatelé",
"select users" => "vybrat uživatele",
"Editable" => "Upravovatelné",
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 4ff0d722042..cd148d757f7 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -183,6 +183,7 @@
"Start week on" => "Erster Wochentag",
"Cache" => "Zwischenspeicher",
"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen",
+"URLs" => "URLs",
"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab",
"more info" => "weitere Informationen",
"Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
index 1a01bb713f9..be3db9bfaeb 100644
--- a/apps/calendar/l10n/eo.php
+++ b/apps/calendar/l10n/eo.php
@@ -8,7 +8,7 @@
"events has been saved in the new calendar" => "okazaĵoj estas konservitaj en la nova kalendaro",
"Import failed" => "Enporto malsukcesis",
"events has been saved in your calendar" => "okazaĵoj estas konservitaj en via kalendaro",
-"New Timezone:" => "Nova horzono:",
+"New Timezone:" => "Nova horozono:",
"Timezone changed" => "La horozono estas ŝanĝita",
"Invalid request" => "Nevalida peto",
"Calendar" => "Kalendaro",
@@ -112,6 +112,7 @@
"Month" => "Monato",
"List" => "Listo",
"Today" => "Hodiaŭ",
+"Settings" => "Agordo",
"Your calendars" => "Viaj kalendaroj",
"CalDav Link" => "CalDav-a ligilo",
"Shared calendars" => "Kunhavigitaj kalendaroj",
@@ -173,11 +174,16 @@
"No categories selected" => "Neniu kategorio elektita",
"of" => "de",
"at" => "ĉe",
+"General" => "Ĝenerala",
"Timezone" => "Horozono",
+"Update timezone automatically" => "Aŭtomate ĝisdatigi la horozonon",
+"Time format" => "Horoformo",
"24h" => "24h",
"12h" => "12h",
+"Start week on" => "Komenci semajnon je",
"Cache" => "Kaŝmemoro",
"Clear cache for repeating events" => "Forviŝi kaŝmemoron por ripeto de okazaĵoj",
+"URLs" => "URL-oj",
"Calendar CalDAV syncing addresses" => "sinkronigaj adresoj por CalDAV-kalendaroj",
"more info" => "pli da informo",
"Primary address (Kontact et al)" => "Ĉefa adreso (Kontact kaj aliaj)",
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index f49aef73d5a..a4323d8ae51 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -33,6 +33,7 @@
"Projects" => "プロジェクト",
"Questions" => "質問事項",
"Work" => "週の始まり",
+"by" => "による",
"unnamed" => "無名",
"New Calendar" => "新しくカレンダーを作成",
"Does not repeat" => "繰り返さない",
@@ -111,6 +112,7 @@
"Month" => "月",
"List" => "リスト",
"Today" => "今日",
+"Settings" => "設定",
"Your calendars" => "あなたのカレンダー",
"CalDav Link" => "CalDavへのリンク",
"Shared calendars" => "共有カレンダー",
@@ -172,11 +174,16 @@
"No categories selected" => "カテゴリが選択されていません",
"of" => "of",
"at" => "at",
+"General" => "一般",
"Timezone" => "タイムゾーン",
+"Update timezone automatically" => "自動的にタイムゾーンを更新",
+"Time format" => "時刻の表示形式",
"24h" => "24h",
"12h" => "12h",
+"Start week on" => "1週間の初めの曜日",
"Cache" => "キャッシュ",
"Clear cache for repeating events" => "イベントを繰り返すためにキャッシュをクリアしてください",
+"URLs" => "URL",
"Calendar CalDAV syncing addresses" => "CalDAVカレンダーの同期用アドレス",
"more info" => "さらに",
"Primary address (Kontact et al)" => "プライマリアドレス(コンタクト等)",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 9c27d367daf..612a1e2ae2b 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -33,6 +33,7 @@
"Projects" => "Проекты",
"Questions" => "Вопросы",
"Work" => "Работа",
+"by" => "до свидания",
"unnamed" => "без имени",
"New Calendar" => "Новый Календарь",
"Does not repeat" => "Не повторяется",
@@ -111,6 +112,7 @@
"Month" => "Месяц",
"List" => "Список",
"Today" => "Сегодня",
+"Settings" => "Параметры",
"Your calendars" => "Ваши календари",
"CalDav Link" => "Ссылка для CalDav",
"Shared calendars" => "Общие календари",
@@ -163,6 +165,8 @@
"Import a calendar file" => "Импортировать календарь из файла",
"Please choose a calendar" => "Пожалуйста, выберите календарь",
"Name of new calendar" => "Название нового календаря",
+"Take an available name!" => "Возьмите разрешенное имя!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Календарь с таким именем уже существует. Если вы продолжите, одноименный календарь будет удален.",
"Import" => "Импортировать",
"Close Dialog" => "Закрыть Сообщение",
"Create a new event" => "Создать новое событие",
@@ -170,10 +174,21 @@
"No categories selected" => "Категории не выбраны",
"of" => "из",
"at" => "на",
+"General" => "Основные",
"Timezone" => "Часовой пояс",
+"Update timezone automatically" => "Автоматическое обновление временной зоны",
+"Time format" => "Формат времени",
"24h" => "24ч",
"12h" => "12ч",
+"Start week on" => "Начало недели",
+"Cache" => "Кэш",
+"Clear cache for repeating events" => "Очистить кэш повторяющихся событий",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "Адрес синхронизации CalDAV",
"more info" => "подробнее",
+"Primary address (Kontact et al)" => "Основной адрес (Контакта)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Читать только ссылки iCalendar",
"Users" => "Пользователи",
"select users" => "выбрать пользователей",
"Editable" => "Редактируемо",
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
index 7a488751c4f..585132314bb 100644
--- a/apps/calendar/l10n/sl.php
+++ b/apps/calendar/l10n/sl.php
@@ -1,7 +1,13 @@
<?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Vsi koledarji niso povsem predpomnjeni",
+"Everything seems to be completely cached" => "Izgleda, da je vse v predpomnilniku",
"No calendars found." => "Ni bilo najdenih koledarjev.",
"No events found." => "Ni bilo najdenih dogodkov.",
"Wrong calendar" => "Napačen koledar",
+"The file contained either no events or all events are already saved in your calendar." => "Datoteka ni vsebovala dogodkov ali pa so vsi dogodki že shranjeni v koledarju.",
+"events has been saved in the new calendar" => "dogodki so bili shranjeni v nov koledar",
+"Import failed" => "Uvoz je spodletel",
+"events has been saved in your calendar" => "dogodki so bili shranjeni v vaš koledar",
"New Timezone:" => "Nov časovni pas:",
"Timezone changed" => "Časovni pas je bil spremenjen",
"Invalid request" => "Neveljaven zahtevek",
@@ -27,6 +33,7 @@
"Projects" => "Projekt",
"Questions" => "Vprašanja",
"Work" => "Delo",
+"by" => "od",
"unnamed" => "neimenovan",
"New Calendar" => "Nov koledar",
"Does not repeat" => "Se ne ponavlja",
@@ -73,6 +80,25 @@
"by day and month" => "po dnevu in mesecu",
"Date" => "Datum",
"Cal." => "Kol.",
+"Sun." => "ned.",
+"Mon." => "pon.",
+"Tue." => "tor.",
+"Wed." => "sre.",
+"Thu." => "čet.",
+"Fri." => "pet.",
+"Sat." => "sob.",
+"Jan." => "jan.",
+"Feb." => "feb.",
+"Mar." => "mar.",
+"Apr." => "apr.",
+"May." => "maj",
+"Jun." => "jun.",
+"Jul." => "jul.",
+"Aug." => "avg.",
+"Sep." => "sep.",
+"Oct." => "okt.",
+"Nov." => "nov.",
+"Dec." => "dec.",
"All day" => "Cel dan",
"Missing fields" => "Mankajoča polja",
"Title" => "Naslov",
@@ -86,6 +112,7 @@
"Month" => "Mesec",
"List" => "Seznam",
"Today" => "Danes",
+"Settings" => "Nastavitve",
"Your calendars" => "Vaši koledarji",
"CalDav Link" => "CalDav povezava",
"Shared calendars" => "Koledarji v souporabi",
@@ -136,7 +163,10 @@
"occurrences" => "ponovitev",
"create a new calendar" => "Ustvari nov koledar",
"Import a calendar file" => "Uvozi datoteko koledarja",
+"Please choose a calendar" => "Prosimo, če izberete koledar",
"Name of new calendar" => "Ime novega koledarja",
+"Take an available name!" => "Izberite prosto ime!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Koledar s tem imenom že obstaja. Če nadaljujete, bosta koledarja združena.",
"Import" => "Uvozi",
"Close Dialog" => "Zapri dialog",
"Create a new event" => "Ustvari nov dogodek",
@@ -144,9 +174,21 @@
"No categories selected" => "Nobena kategorija ni izbrana",
"of" => "od",
"at" => "pri",
+"General" => "Splošno",
"Timezone" => "Časovni pas",
+"Update timezone automatically" => "Samodejno posodobi časovni pas",
+"Time format" => "Oblika zapisa časa",
"24h" => "24ur",
"12h" => "12ur",
+"Start week on" => "Začni teden z",
+"Cache" => "Predpomnilnik",
+"Clear cache for repeating events" => "Počisti predpomnilnik za ponavljajoče dogodke",
+"URLs" => "URLji",
+"Calendar CalDAV syncing addresses" => "CalDAV naslov za usklajevanje koledarjev",
+"more info" => "dodatne informacije",
+"Primary address (Kontact et al)" => "Glavni naslov (Kontakt et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "iCalendar povezava/e samo za branje",
"Users" => "Uporabniki",
"select users" => "izberite uporabnike",
"Editable" => "Možno urejanje",
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
index 8d09fa162dc..0b92a623d40 100644
--- a/apps/calendar/l10n/th_TH.php
+++ b/apps/calendar/l10n/th_TH.php
@@ -1,7 +1,13 @@
<?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์",
+"Everything seems to be completely cached" => "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว",
"No calendars found." => "ไม่พบปฏิทินที่ต้องการ",
"No events found." => "ไม่พบกิจกรรมที่ต้องการ",
"Wrong calendar" => "ปฏิทินไม่ถูกต้อง",
+"The file contained either no events or all events are already saved in your calendar." => "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ",
+"events has been saved in the new calendar" => "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว",
+"Import failed" => "การนำเข้าข้อมูลล้มเหลว",
+"events has been saved in your calendar" => "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว",
"New Timezone:" => "สร้างโซนเวลาใหม่:",
"Timezone changed" => "โซนเวลาถูกเปลี่ยนแล้ว",
"Invalid request" => "คำร้องขอไม่ถูกต้อง",
@@ -27,6 +33,7 @@
"Projects" => "โครงการ",
"Questions" => "คำถาม",
"Work" => "งาน",
+"by" => "โดย",
"unnamed" => "ไม่มีชื่อ",
"New Calendar" => "สร้างปฏิทินใหม่",
"Does not repeat" => "ไม่ต้องทำซ้ำ",
@@ -73,6 +80,25 @@
"by day and month" => "ตามวันและเดือน",
"Date" => "วันที่",
"Cal." => "คำนวณ",
+"Sun." => "อา.",
+"Mon." => "จ.",
+"Tue." => "อ.",
+"Wed." => "พ.",
+"Thu." => "พฤ.",
+"Fri." => "ศ.",
+"Sat." => "ส.",
+"Jan." => "ม.ค.",
+"Feb." => "ก.พ.",
+"Mar." => "มี.ค.",
+"Apr." => "เม.ย.",
+"May." => "พ.ค.",
+"Jun." => "มิ.ย.",
+"Jul." => "ก.ค.",
+"Aug." => "ส.ค.",
+"Sep." => "ก.ย.",
+"Oct." => "ต.ค.",
+"Nov." => "พ.ย.",
+"Dec." => "ธ.ค.",
"All day" => "ทั้งวัน",
"Missing fields" => "ช่องฟิลด์เกิดการสูญหาย",
"Title" => "ชื่อกิจกรรม",
@@ -86,6 +112,7 @@
"Month" => "เดือน",
"List" => "รายการ",
"Today" => "วันนี้",
+"Settings" => "ตั้งค่า",
"Your calendars" => "ปฏิทินของคุณ",
"CalDav Link" => "ลิงค์ CalDav",
"Shared calendars" => "ปฏิทินที่เปิดแชร์",
@@ -136,7 +163,10 @@
"occurrences" => "จำนวนที่ปรากฏ",
"create a new calendar" => "สร้างปฏิทินใหม่",
"Import a calendar file" => "นำเข้าไฟล์ปฏิทิน",
+"Please choose a calendar" => "กรุณาเลือกปฏิทิน",
"Name of new calendar" => "ชื่อของปฏิทิน",
+"Take an available name!" => "เลือกชื่อที่ต้องการ",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน",
"Import" => "นำเข้าข้อมูล",
"Close Dialog" => "ปิดกล่องข้อความโต้ตอบ",
"Create a new event" => "สร้างกิจกรรมใหม่",
@@ -144,9 +174,21 @@
"No categories selected" => "ยังไม่ได้เลือกหมวดหมู่",
"of" => "ของ",
"at" => "ที่",
+"General" => "ทั่วไป",
"Timezone" => "โซนเวลา",
+"Update timezone automatically" => "อัพเดทโซนเวลาอัตโนมัติ",
+"Time format" => "รูปแบบเวลา",
"24h" => "24 ช.ม.",
"12h" => "12 ช.ม.",
+"Start week on" => "เริ่มต้นสัปดาห์ด้วย",
+"Cache" => "หน่วยความจำแคช",
+"Clear cache for repeating events" => "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV",
+"more info" => "ข้อมูลเพิ่มเติม",
+"Primary address (Kontact et al)" => "ที่อยู่หลัก (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "อ่านเฉพาะลิงก์ iCalendar เท่านั้น",
"Users" => "ผู้ใช้งาน",
"select users" => "เลือกผู้ใช้งาน",
"Editable" => "สามารถแก้ไขได้",
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index d36891cb2b9..368f8406e71 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -273,8 +273,10 @@ class OC_Calendar_Import{
*/
private function isDuplicate($insertid){
$newobject = OC_Calendar_Object::find($insertid);
- $stmt = OCP\DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*calendar_objects WHERE objecttype=? AND startdate=? AND enddate=? AND repeating=? AND summary=? AND calendardata=?');
- $result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata']));
+ $stmt = OCP\DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*calendar_objects
+ INNER JOIN *PREFIX*calendar_calendars ON calendarid=*PREFIX*calendar_calendars.id
+ WHERE objecttype=? AND startdate=? AND enddate=? AND repeating=? AND summary=? AND calendardata=? AND userid = ?');
+ $result = $stmt->execute(array($newobject['objecttype'],$newobject['startdate'],$newobject['enddate'],$newobject['repeating'],$newobject['summary'],$newobject['calendardata'], $this->userid));
$result = $result->fetchRow();
if($result['count'] >= 2){
return true;
diff --git a/apps/contacts/ajax/contact/add.php b/apps/contacts/ajax/contact/add.php
index 043e947dc4b..c7cec7d9461 100644
--- a/apps/contacts/ajax/contact/add.php
+++ b/apps/contacts/ajax/contact/add.php
@@ -49,10 +49,14 @@ if(!$id) {
exit();
}
+$lastmodified = OC_Contacts_App::lastModified($vcard);
+if(!$lastmodified) {
+ $lastmodified = new DateTime();
+}
OCP\JSON::success(array(
'data' => array(
'id' => $id,
'aid' => $aid,
- 'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
+ 'lastmodified' => $lastmodified->format('U')
)
));
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
index c22f18937d7..5bf337e645e 100644
--- a/apps/contacts/ajax/contact/details.php
+++ b/apps/contacts/ajax/contact/details.php
@@ -50,9 +50,13 @@ if(isset($details['PHOTO'])) {
} else {
$details['PHOTO'] = false;
}
+$lastmodified = OC_Contacts_App::lastModified($vcard);
+if(!$lastmodified) {
+ $lastmodified = new DateTime();
+}
$details['id'] = $id;
$details['displayname'] = $card['fullname'];
$details['addressbookid'] = $card['addressbookid'];
-$details['lastmodified'] = OC_Contacts_App::lastModified($vcard)->format('U');
+$details['lastmodified'] = $lastmodified->format('U');
OC_Contacts_App::setLastModifiedHeader($vcard);
OCP\JSON::success(array('data' => $details));
diff --git a/apps/contacts/ajax/contact/move.php b/apps/contacts/ajax/contact/move.php
index a3336c3cb6c..053343c47ed 100644
--- a/apps/contacts/ajax/contact/move.php
+++ b/apps/contacts/ajax/contact/move.php
@@ -7,35 +7,23 @@
* later.
* See the COPYING-README file.
*/
-
+
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
OCP\JSON::callCheck();
-$ids = $_POST['ids'];
+$id = intval($_POST['id']);
$aid = intval($_POST['aid']);
+$isaddressbook = isset($_POST['isaddressbook']) ? true: false;
+
+// Ownership checking
OC_Contacts_App::getAddressbook($aid);
-
-if(!is_array($ids)) {
- $ids = array($ids,);
-}
-$goodids = array();
-foreach ($ids as $id){
- try {
- $card = OC_Contacts_App::getContactObject( intval($id) );
- if($card) {
- $goodids[] = $id;
- }
- } catch (Exception $e) {
- OCP\Util::writeLog('contacts', 'Error moving contact "'.$id.'" to addressbook "'.$aid.'"'.$e->getMessage(), OCP\Util::ERROR);
- }
-}
try {
- OC_Contacts_VCard::moveToAddressBook($aid, $ids);
+ OC_Contacts_VCard::moveToAddressBook($aid, $id, $isaddressbook);
} catch (Exception $e) {
$msg = $e->getMessage();
- OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $ids).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
+ OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $id).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
OC_JSON::error(array('data' => array('message' => $msg,)));
}
-
-OC_JSON::success(array('data' => array('ids' => $goodids,))); \ No newline at end of file
+
+OC_JSON::success(array('data' => array('ids' => $id,))); \ No newline at end of file
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 9eee55583a4..6cb5b59525c 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,12 +36,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
$carddavBackend = new OC_Connector_Sabre_CardDAV();
// Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CardDAV_AddressBookRoot = new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
+$Sabre_CardDAV_AddressBookRoot->disableListing = true; // Disable listening
$nodes = array(
- $collection,
- new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
+ $Sabre_CalDAV_Principal_Collection,
+ $Sabre_CardDAV_AddressBookRoot,
);
// Fire up server
diff --git a/apps/contacts/img/contact-new.png b/apps/contacts/img/contact-new.png
index 087ad9ab2d3..a91f2e620fa 100644
--- a/apps/contacts/img/contact-new.png
+++ b/apps/contacts/img/contact-new.png
Binary files differ
diff --git a/apps/contacts/img/person.png b/apps/contacts/img/person.png
index 17e79196540..e88bb5653af 100644
--- a/apps/contacts/img/person.png
+++ b/apps/contacts/img/person.png
Binary files differ
diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
index 4edba0c5489..8293df61829 100644
--- a/apps/contacts/img/person_large.png
+++ b/apps/contacts/img/person_large.png
Binary files differ
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 35637de050d..f535dc03f3f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1437,8 +1437,12 @@ OC.Contacts={
if(dragitem.data('bookid') == droptarget.data('id')) {
return false;
}
- var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
- $.post(OC.filePath('contacts', 'ajax', 'contact/move.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
+ var droplist = (droptarget.is('ul')) ? droptarget : droptarget.next();
+ $.post(OC.filePath('contacts', 'ajax', 'contact/move.php'),
+ {
+ id: dragitem.data('id'),
+ aid: droptarget.data('id')
+ },
function(jsondata){
if(jsondata.status == 'success'){
dragitem.attr('data-bookid', droptarget.data('id'))
@@ -1454,7 +1458,27 @@ OC.Contacts={
});
},
dropAddressbook:function(event, dragitem, droptarget) {
- alert('Dropping address books not implemented yet');
+ if(confirm(t('contacts', 'Do you want to merge these address books?'))) {
+ if(dragitem.data('bookid') == droptarget.data('id')) {
+ return false;
+ }
+ var droplist = (droptarget.is('ul')) ? droptarget : droptarget.next();
+ $.post(OC.filePath('contacts', 'ajax', 'contact/move.php'),
+ {
+ id: dragitem.data('id'),
+ aid: droptarget.data('id'),
+ isaddressbook: 1
+ },
+ function(jsondata){
+ if(jsondata.status == 'success'){
+ OC.Contacts.Contacts.update(); // Easier to refresh the whole bunch.
+ } else {
+ OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+ }
+ });
+ } else {
+ return false;
+ }
},
/**
* @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 72550522d5b..7abdc4114fd 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -62,6 +62,7 @@
"Error loading profile picture." => "Error en carregar la imatge de perfil.",
"Select type" => "Seleccioneu un tipus",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
+"Do you want to merge these address books?" => "Voleu fusionar aquestes llibretes d'adreces?",
"Result: " => "Resultat: ",
" imported, " => " importat, ",
" failed." => " fallada.",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 9b342328ac9..89f242d5c86 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -10,9 +10,11 @@
"No contacts found." => "Žádné kontakty nenalezeny.",
"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
"element name is not set." => "jméno elementu není nastaveno.",
+"Could not parse contact: " => "Nelze analyzovat kontakty",
"Cannot add empty property." => "Nelze přidat prazdný údaj.",
"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
"Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
+"Error adding contact property: " => "Chyba během přidávání vlastností kontaktu:",
"Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
"Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
"Missing ID" => "Chybí ID",
@@ -57,10 +59,14 @@
"Edit name" => "Upravit jméno",
"No files selected for upload." => "Žádné soubory nebyly vybrány k nahrání.",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost.",
+"Error loading profile picture." => "Chyba při otevírání obrázku profilu",
"Select type" => "Vybrat typ",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace.",
"Result: " => "Výsledek: ",
" imported, " => "importováno v pořádku,",
" failed." => "neimportováno.",
+"Displayname cannot be empty." => "Zobrazované jméno nemůže zůstat prázdné.",
+"Addressbook not found: " => "Adresář nenalezen:",
"This is not your addressbook." => "Toto není Váš adresář.",
"Contact could not be found." => "Kontakt nebyl nalezen.",
"Address" => "Adresa",
@@ -78,12 +84,38 @@
"Pager" => "Pager",
"Internet" => "Internet",
"Birthday" => "Narozeniny",
+"Business" => "Pracovní",
+"Call" => "Volat",
+"Clients" => "Klienti",
+"Deliverer" => "Dodavatel",
+"Holidays" => "Prázdniny",
+"Ideas" => "Nápady",
+"Journey" => "Cestování",
+"Jubilee" => "Jubileum",
+"Meeting" => "Schůzka",
+"Other" => "Ostatní",
+"Personal" => "Osobní",
+"Projects" => "Projekty",
+"Questions" => "Dotazy",
"{name}'s Birthday" => "Narozeniny {name}",
"Contact" => "Kontakt",
"Add Contact" => "Přidat kontakt",
"Import" => "Import",
+"Settings" => "Nastavení",
"Addressbooks" => "Adresáře",
"Close" => "Zavřít",
+"Keyboard shortcuts" => "Klávesoví zkratky",
+"Navigation" => "Navigace",
+"Next contact in list" => "Následující kontakt v seznamu",
+"Previous contact in list" => "Předchozí kontakt v seznamu",
+"Expand/collapse current addressbook" => "Rozbalit/sbalit aktuální Adresář",
+"Next addressbook" => "Následující Adresář",
+"Previous addressbook" => "Předchozí Adresář",
+"Actions" => "Akce",
+"Refresh contacts list" => "Občerstvit seznam kontaktů",
+"Add new contact" => "Přidat kontakt",
+"Add new addressbook" => "Předat nový Adresář",
+"Delete current contact" => "Odstranit aktuální kontakt",
"Drop photo to upload" => "Přetáhněte sem fotku pro její nahrání",
"Delete current photo" => "Smazat současnou fotku",
"Edit current photo" => "Upravit současnou fotku",
@@ -94,6 +126,9 @@
"Delete" => "Odstranit",
"Nickname" => "Přezdívka",
"Enter nickname" => "Zadejte přezdívku",
+"Web site" => "Web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Přejít na web",
"dd-mm-yyyy" => "dd. mm. yyyy",
"Groups" => "Skupiny",
"Separate groups with commas" => "Oddělte skupiny čárkami",
@@ -117,10 +152,15 @@
"Edit address" => "Upravit adresu",
"Type" => "Typ",
"PO Box" => "PO box",
+"Street address" => "Ulice",
+"Street and number" => "Ulice a číslo",
"Extended" => "Rozšířené",
+"Apartment number etc." => "Byt číslo atd.",
"City" => "Město",
"Region" => "Kraj",
+"E.g. state or province" => "Např. stát nebo okres",
"Zipcode" => "PSČ",
+"Postal code" => "PSČ",
"Country" => "Země",
"Addressbook" => "Adresář",
"Hon. prefixes" => "Tituly před",
@@ -150,13 +190,21 @@
"You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
"Add contact" => "Přidat kontakt",
"Configure addressbooks" => "Nastavit adresář",
+"Select Address Books" => "Vybrat Adresář",
+"Enter name" => "Vložte jméno",
+"Enter description" => "Vložte popis",
"CardDAV syncing addresses" => "Adresa pro synchronizaci pomocí CardDAV:",
"more info" => "víc informací",
"Primary address (Kontact et al)" => "Hlavní adresa (Kontakt etc)",
"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Zobrazit odklaz CardDAV:",
+"Show read-only VCF link" => "Zobrazit odkaz VCF pouze pro čtení",
"Download" => "Stažení",
"Edit" => "Editovat",
"New Address Book" => "Nový adresář",
+"Name" => "Název",
+"Description" => "Popis",
"Save" => "Uložit",
-"Cancel" => "Storno"
+"Cancel" => "Storno",
+"More..." => "Více..."
);
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index a47b61d5075..2aeb106c48d 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -62,6 +62,7 @@
"Error loading profile picture." => "Fehler beim Laden des Profilbildes.",
"Select type" => "Wähle Typ",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten.",
+"Do you want to merge these address books?" => "Möchtest du diese Adressbücher zusammenführen?",
"Result: " => "Ergebnis: ",
" imported, " => " importiert, ",
" failed." => " fehlgeschlagen.",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 2f31bccbf23..8e1b0e61e64 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -59,11 +59,14 @@
"Edit name" => "Αλλαγή ονόματος",
"No files selected for upload." => "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server.",
+"Error loading profile picture." => "Σφάλμα στην φόρτωση εικόνας προφίλ.",
"Select type" => "Επιλογή τύπου",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν.",
"Result: " => "Αποτέλεσμα: ",
" imported, " => " εισάγεται,",
" failed." => " απέτυχε.",
+"Displayname cannot be empty." => "Το όνομα προβολής δεν μπορεί να είναι κενό. ",
+"Addressbook not found: " => "Το βιβλίο διευθύνσεων δεν βρέθηκε:",
"This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
"Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
"Address" => "Διεύθυνση",
@@ -106,6 +109,8 @@
"Next contact in list" => "Επόμενη επαφή στη λίστα",
"Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
"Expand/collapse current addressbook" => "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων",
+"Next addressbook" => "Επόμενο βιβλίο διευθύνσεων",
+"Previous addressbook" => "Προηγούμενο βιβλίο διευθύνσεων",
"Actions" => "Ενέργειες",
"Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
"Add new contact" => "Προσθήκη νέας επαφής",
@@ -192,6 +197,8 @@
"more info" => "περισσότερες πληροφορίες",
"Primary address (Kontact et al)" => "Κύρια διεύθυνση",
"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Εμφάνιση συνδέσμου CardDav",
+"Show read-only VCF link" => "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση",
"Download" => "Λήψη",
"Edit" => "Επεξεργασία",
"New Address Book" => "Νέο βιβλίο διευθύνσεων",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index 33c0106d5a4..9787b6e010f 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -10,6 +10,7 @@
"No contacts found." => "Neniu kontakto troviĝis.",
"There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
"element name is not set." => "eronomo ne agordiĝis.",
+"Could not parse contact: " => "Ne eblis analizi kontakton:",
"Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
"At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
"Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
@@ -53,6 +54,7 @@
"Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
"Error" => "Eraro",
"This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
+"Couldn't serialize elements." => "Ne eblis seriigi erojn.",
"Edit name" => "Redakti nomon",
"No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo.",
@@ -81,8 +83,11 @@
"Business" => "Negoco",
"Call" => "Voko",
"Clients" => "Klientoj",
+"Deliverer" => "Liveranto",
"Holidays" => "Ferioj",
"Ideas" => "Ideoj",
+"Journey" => "Vojaĝo",
+"Jubilee" => "Jubileo",
"Meeting" => "Kunveno",
"Other" => "Alia",
"Personal" => "Persona",
@@ -97,10 +102,10 @@
"Close" => "Fermi",
"Keyboard shortcuts" => "Fulmoklavoj",
"Navigation" => "Navigado",
-"Next contact in list" => "Sekva kontakto en la listo",
-"Previous contact in list" => "Malsekva kontakto en la listo",
-"Next addressbook" => "Sekva adresaro",
-"Previous addressbook" => "Malsekva adresaro",
+"Next contact in list" => "Jena kontakto en la listo",
+"Previous contact in list" => "Maljena kontakto en la listo",
+"Next addressbook" => "Jena adresaro",
+"Previous addressbook" => "Maljena adresaro",
"Actions" => "Agoj",
"Refresh contacts list" => "Refreŝigi la kontaktoliston",
"Add new contact" => "Aldoni novan kontakton",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 93299380d22..eba0fff150d 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -59,6 +59,7 @@
"Edit name" => "Éditer le nom",
"No files selected for upload." => "Aucun fichiers choisis pour être chargés",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
+"Error loading profile picture." => "Erreur pendant le chargement de la photo de profil.",
"Select type" => "Sélectionner un type",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.",
"Result: " => "Résultat :",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index e1af39fe91a..eb98780d472 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -62,6 +62,7 @@
"Error loading profile picture." => "Errore durante il caricamento dell'immagine di profilo.",
"Select type" => "Seleziona il tipo",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
+"Do you want to merge these address books?" => "Vuoi unire queste rubriche?",
"Result: " => "Risultato: ",
" imported, " => " importato, ",
" failed." => " non riuscito.",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 4f7800e1dbc..c3be215ce6e 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,12 +1,12 @@
<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
+"Error (de)activating addressbook." => "アドレス帳の有効/無効化に失敗しました。",
"id is not set." => "idが設定されていません。",
-"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
-"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレス帳を更新することはできません。",
+"Error updating addressbook." => "アドレス帳の更新に失敗しました。",
"No ID provided" => "IDが提供されていません",
"Error setting checksum." => "チェックサムの設定エラー。",
"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
-"No address books found." => "アドレスブックが見つかりません。",
+"No address books found." => "アドレス帳が見つかりません。",
"No contacts found." => "連絡先が見つかりません。",
"There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
"element name is not set." => "要素名が設定されていません。",
@@ -59,12 +59,15 @@
"Edit name" => "名前を編集",
"No files selected for upload." => "アップロードするファイルが選択されていません。",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
+"Error loading profile picture." => "プロファイルの画像の読み込みエラー",
"Select type" => "タイプを選択",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。",
+"Do you want to merge these address books?" => "これらのアドレス帳をマージしてもよろしいですか?",
"Result: " => "結果: ",
" imported, " => " をインポート、 ",
" failed." => " は失敗しました。",
"Displayname cannot be empty." => "表示名は空にできません。",
-"Addressbook not found: " => "連絡先が見つかりません:",
+"Addressbook not found: " => "アドレス帳が見つかりません:",
"This is not your addressbook." => "これはあなたの電話帳ではありません。",
"Contact could not be found." => "連絡先を見つける事ができません。",
"Address" => "住所",
@@ -100,25 +103,26 @@
"Add Contact" => "連絡先の追加",
"Import" => "インポート",
"Settings" => "設定",
-"Addressbooks" => "電話帳",
+"Addressbooks" => "アドレス帳",
"Close" => "閉じる",
"Keyboard shortcuts" => "キーボードショートカット",
"Navigation" => "ナビゲーション",
"Next contact in list" => "リスト内の次のコンタクト",
"Previous contact in list" => "リスト内の前のコンタクト",
-"Expand/collapse current addressbook" => "現在の連絡帳を展開する/折りたたむ",
-"Next addressbook" => "次の連絡先",
-"Previous addressbook" => "前の連絡先",
+"Expand/collapse current addressbook" => "現在のアドレス帳を展開する/折りたたむ",
+"Next addressbook" => "次のアドレス帳",
+"Previous addressbook" => "前のアドレス帳",
"Actions" => "アクション",
"Refresh contacts list" => "連絡先リストを再読込する",
"Add new contact" => "新しいコンタクトを追加",
-"Add new addressbook" => "新しいアドレスブックを追加",
+"Add new addressbook" => "新しいアドレス帳を追加",
"Delete current contact" => "現在のコンタクトを削除",
"Drop photo to upload" => "写真をドロップしてアップロード",
"Delete current photo" => "現在の写真を削除",
"Edit current photo" => "現在の写真を編集",
"Upload new photo" => "新しい写真をアップロード",
"Select photo from ownCloud" => "ownCloudから写真を選択",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順",
"Edit name details" => "名前の詳細を編集",
"Delete" => "削除",
"Nickname" => "ニックネーム",
@@ -131,7 +135,7 @@
"Separate groups with commas" => "コンマでグループを分割",
"Edit groups" => "グループを編集",
"Preferred" => "推奨",
-"Please specify a valid email address." => "連絡先を追加",
+"Please specify a valid email address." => "有効なメールアドレスを指定してください。",
"Enter email address" => "メールアドレスを入力",
"Mail to address" => "アドレスへメールを送る",
"Delete email address" => "メールアドレスを削除",
@@ -159,7 +163,8 @@
"Zipcode" => "郵便番号",
"Postal code" => "郵便番号",
"Country" => "国名",
-"Addressbook" => "アドレスブック",
+"Addressbook" => "アドレス帳",
+"Hon. prefixes" => "敬称",
"Miss" => "Miss",
"Ms" => "Ms",
"Mr" => "Mr",
@@ -169,7 +174,7 @@
"Given name" => "名",
"Additional names" => "ミドルネーム",
"Family name" => "姓",
-"Hon. suffixes" => "ストレージへの連絡先のアップロードエラー。",
+"Hon. suffixes" => "称号",
"J.D." => "J.D.",
"M.D." => "M.D.",
"D.O." => "D.O.",
@@ -179,14 +184,14 @@
"Jr." => "Jr.",
"Sn." => "Sn.",
"Import a contacts file" => "コンタクトファイルをインポート",
-"Please choose the addressbook" => "アドレスブックを選択してください",
-"create a new addressbook" => "新しいアドレスブックを作成",
+"Please choose the addressbook" => "アドレス帳を選択してください",
+"create a new addressbook" => "新しいアドレス帳を作成",
"Name of new addressbook" => "新しいアドレスブックの名前",
"Importing contacts" => "コンタクトをインポート",
-"You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
+"You have no contacts in your addressbook." => "アドレス帳に連絡先が登録されていません。",
"Add contact" => "連絡先を追加",
"Configure addressbooks" => "アドレス帳を設定",
-"Select Address Books" => "連絡先を洗濯してください",
+"Select Address Books" => "アドレス帳を選択してください",
"Enter name" => "名前を入力",
"Enter description" => "説明を入力してください",
"CardDAV syncing addresses" => "CardDAV同期アドレス",
@@ -197,7 +202,7 @@
"Show read-only VCF link" => "読み取り専用のVCFリンクを表示",
"Download" => "ダウンロード",
"Edit" => "編集",
-"New Address Book" => "新規電話帳",
+"New Address Book" => "新規のアドレス帳",
"Name" => "名前",
"Description" => "説明",
"Save" => "保存",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 1dc0cef74b5..8746a839193 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -10,9 +10,11 @@
"No contacts found." => "Ni bilo najdenih stikov.",
"There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
"element name is not set." => "ime elementa ni nastavljeno.",
+"Could not parse contact: " => "Ne morem razčleniti stika:",
"Cannot add empty property." => "Ne morem dodati prazne lastnosti.",
"At least one of the address fields has to be filled out." => "Vsaj eno izmed polj je še potrebno izpolniti.",
"Trying to add duplicate property: " => "Poskušam dodati podvojeno lastnost:",
+"Error adding contact property: " => "Napaka pri dodajanju lastnosti stiku:",
"Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
"Error deleting contact property." => "Napaka pri brisanju lastnosti stika.",
"Missing ID" => "Manjkajoč ID",
@@ -57,10 +59,15 @@
"Edit name" => "Uredi ime",
"No files selected for upload." => "Nobena datoteka ni bila izbrana za nalaganje.",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku.",
+"Error loading profile picture." => "Napaka pri nalaganju slike profila.",
"Select type" => "Izberite vrsto",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris.",
+"Do you want to merge these address books?" => "Ali želite združiti adresarje?",
"Result: " => "Rezultati: ",
" imported, " => " uvoženih, ",
" failed." => " je spodletelo.",
+"Displayname cannot be empty." => "Ime za prikaz ne more biti prazno.",
+"Addressbook not found: " => "Adresar ni bil najden:",
"This is not your addressbook." => "To ni vaš imenik.",
"Contact could not be found." => "Stika ni bilo mogoče najti.",
"Address" => "Naslov",
@@ -78,12 +85,38 @@
"Pager" => "Pozivnik",
"Internet" => "Internet",
"Birthday" => "Rojstni dan",
+"Business" => "Poslovno",
+"Call" => "Klic",
+"Clients" => "Stranka",
+"Deliverer" => "Dostavljalec",
+"Holidays" => "Prazniki",
+"Ideas" => "Ideje",
+"Journey" => "Potovanje",
+"Jubilee" => "Jubilej",
+"Meeting" => "Sestanek",
+"Other" => "Drugo",
+"Personal" => "Osebno",
+"Projects" => "Projekti",
+"Questions" => "Vprašanja",
"{name}'s Birthday" => "{name} - rojstni dan",
"Contact" => "Stik",
"Add Contact" => "Dodaj stik",
"Import" => "Uvozi",
+"Settings" => "Nastavitve",
"Addressbooks" => "Imeniki",
"Close" => "Zapri",
+"Keyboard shortcuts" => "Bližnjice na tipkovnici",
+"Navigation" => "Krmarjenje",
+"Next contact in list" => "Naslednji stik na seznamu",
+"Previous contact in list" => "Predhodni stik na seznamu",
+"Expand/collapse current addressbook" => "Razširi/skrči trenutni adresar",
+"Next addressbook" => "Naslednji adresar",
+"Previous addressbook" => "Predhodni adresar",
+"Actions" => "Dejanja",
+"Refresh contacts list" => "Osveži seznam stikov",
+"Add new contact" => "Dodaj nov stik",
+"Add new addressbook" => "Dodaj nov adresar",
+"Delete current contact" => "Izbriši trenutni stik",
"Drop photo to upload" => "Spustite sliko tukaj, da bi jo naložili",
"Delete current photo" => "Izbriši trenutno sliko",
"Edit current photo" => "Uredi trenutno sliko",
@@ -94,6 +127,9 @@
"Delete" => "Izbriši",
"Nickname" => "Vzdevek",
"Enter nickname" => "Vnesite vzdevek",
+"Web site" => "Spletna stran",
+"http://www.somesite.com" => "http://www.nekastran.si",
+"Go to web site" => "Pojdi na spletno stran",
"dd-mm-yyyy" => "dd. mm. yyyy",
"Groups" => "Skupine",
"Separate groups with commas" => "Skupine ločite z vejicami",
@@ -117,10 +153,15 @@
"Edit address" => "Uredi naslov",
"Type" => "Vrsta",
"PO Box" => "Poštni predal",
+"Street address" => "Ulični naslov",
+"Street and number" => "Ulica in štelika",
"Extended" => "Razširjeno",
+"Apartment number etc." => "Številka stanovanja itd.",
"City" => "Mesto",
"Region" => "Regija",
+"E.g. state or province" => "Npr. dežela ali pokrajina",
"Zipcode" => "Poštna št.",
+"Postal code" => "Poštna številka",
"Country" => "Dežela",
"Addressbook" => "Imenik",
"Hon. prefixes" => "Predpone",
@@ -150,13 +191,21 @@
"You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
"Add contact" => "Dodaj stik",
"Configure addressbooks" => "Nastavi imenike",
+"Select Address Books" => "Izberite adresarje",
+"Enter name" => "Vnesite ime",
+"Enter description" => "Vnesite opis",
"CardDAV syncing addresses" => "CardDAV naslovi za sinhronizacijo",
"more info" => "več informacij",
"Primary address (Kontact et al)" => "Primarni naslov (za kontakt et al)",
"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Pokaži CardDav povezavo",
+"Show read-only VCF link" => "Pokaži VCF povezavo samo za branje",
"Download" => "Prenesi",
"Edit" => "Uredi",
"New Address Book" => "Nov imenik",
+"Name" => "Ime",
+"Description" => "Opis",
"Save" => "Shrani",
-"Cancel" => "Prekliči"
+"Cancel" => "Prekliči",
+"More..." => "Več..."
);
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index f470a338b6a..1fee6455945 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -13,6 +13,7 @@
"Could not parse contact: " => "Kunde inte läsa kontakt:",
"Cannot add empty property." => "Kan inte lägga till en tom egenskap.",
"At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i.",
+"Trying to add duplicate property: " => "Försöker lägga till dubblett:",
"Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
"Information about vCard is incorrect. Please reload the page." => "Information om vCard är felaktigt. Vänligen ladda om sidan.",
"Error deleting contact property." => "Fel uppstod när kontaktegenskap skulle tas bort.",
@@ -58,8 +59,10 @@
"Edit name" => "Ändra namn",
"No files selected for upload." => "Inga filer valda för uppladdning",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server.",
+"Error loading profile picture." => "Fel vid hämtning av profilbild.",
"Select type" => "Välj typ",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade.",
+"Do you want to merge these address books?" => "Vill du slå samman dessa adressböcker?",
"Result: " => "Resultat:",
" imported, " => "importerad,",
" failed." => "misslyckades.",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 553271d88f6..887d13bc383 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -10,9 +10,11 @@
"No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
"There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"Could not parse contact: " => "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้",
"Cannot add empty property." => "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้",
"At least one of the address fields has to be filled out." => "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป",
"Trying to add duplicate property: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
+"Error adding contact property: " => "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ",
"Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
"Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
"Missing ID" => "รหัสสูญหาย",
@@ -57,10 +59,15 @@
"Edit name" => "แก้ไขชื่อ",
"No files selected for upload." => "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
+"Error loading profile picture." => "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว",
"Select type" => "เลือกชนิด",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน",
+"Do you want to merge these address books?" => "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?",
"Result: " => "ผลลัพธ์: ",
" imported, " => " นำเข้าข้อมูลแล้ว, ",
" failed." => " ล้มเหลว.",
+"Displayname cannot be empty." => "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้",
+"Addressbook not found: " => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
"This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
"Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
"Address" => "ที่อยู่",
@@ -78,12 +85,38 @@
"Pager" => "เพจเจอร์",
"Internet" => "อินเทอร์เน็ต",
"Birthday" => "วันเกิด",
+"Business" => "ธุรกิจ",
+"Call" => "โทร",
+"Clients" => "ลูกค้า",
+"Deliverer" => "ผู้จัดส่ง",
+"Holidays" => "วันหยุด",
+"Ideas" => "ไอเดีย",
+"Journey" => "การเดินทาง",
+"Jubilee" => "งานเฉลิมฉลอง",
+"Meeting" => "ประชุม",
+"Other" => "อื่นๆ",
+"Personal" => "ส่วนตัว",
+"Projects" => "โปรเจค",
+"Questions" => "คำถาม",
"{name}'s Birthday" => "วันเกิดของ {name}",
"Contact" => "ข้อมูลการติดต่อ",
"Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
"Import" => "นำเข้า",
+"Settings" => "ตั้งค่า",
"Addressbooks" => "สมุดบันทึกที่อยู่",
"Close" => "ปิด",
+"Keyboard shortcuts" => "ปุ่มลัด",
+"Navigation" => "ระบบเมนู",
+"Next contact in list" => "ข้อมูลผู้ติดต่อถัดไปในรายการ",
+"Previous contact in list" => "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ",
+"Expand/collapse current addressbook" => "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน",
+"Next addressbook" => "สมุดบันทึกที่อยู่ถัดไป",
+"Previous addressbook" => "สมุดบันทึกที่อยู่ก่อนหน้า",
+"Actions" => "การกระทำ",
+"Refresh contacts list" => "รีเฟรชรายชื่อผู้ติดต่อใหม่",
+"Add new contact" => "เพิ่มข้อมูลผู้ติดต่อใหม่",
+"Add new addressbook" => "เพิ่มสมุดบันทึกที่อยู่ใหม่",
+"Delete current contact" => "ลบข้อมูลผู้ติดต่อปัจจุบัน",
"Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
"Delete current photo" => "ลบรูปภาพปัจจุบัน",
"Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
@@ -94,6 +127,9 @@
"Delete" => "ลบ",
"Nickname" => "ชื่อเล่น",
"Enter nickname" => "กรอกชื่อเล่น",
+"Web site" => "เว็บไซต์",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "ไปที่เว็บไซต์",
"dd-mm-yyyy" => "dd-mm-yyyy",
"Groups" => "กลุ่ม",
"Separate groups with commas" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
@@ -117,10 +153,15 @@
"Edit address" => "แก้ไขที่อยู่",
"Type" => "ประเภท",
"PO Box" => "ตู้ ปณ.",
+"Street address" => "ที่อยู่",
+"Street and number" => "ถนนและหมายเลข",
"Extended" => "เพิ่ม",
+"Apartment number etc." => "หมายเลขอพาร์ทเมนต์ ฯลฯ",
"City" => "เมือง",
"Region" => "ภูมิภาค",
+"E.g. state or province" => "เช่น รัฐ หรือ จังหวัด",
"Zipcode" => "รหัสไปรษณีย์",
+"Postal code" => "รหัสไปรษณีย์",
"Country" => "ประเทศ",
"Addressbook" => "สมุดบันทึกที่อยู่",
"Hon. prefixes" => "คำนำหน้าชื่อคนรัก",
@@ -150,13 +191,21 @@
"You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
"Add contact" => "เพิ่มชื่อผู้ติดต่อ",
"Configure addressbooks" => "กำหนดค่าสมุดบันทึกที่อยู่",
+"Select Address Books" => "เลือกสมุดบันทึกที่อยู่",
+"Enter name" => "กรอกชื่อ",
+"Enter description" => "กรอกคำอธิบาย",
"CardDAV syncing addresses" => "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV",
"more info" => "ข้อมูลเพิ่มเติม",
"Primary address (Kontact et al)" => "ที่อยู่หลัก (สำหรับติดต่อ)",
"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "แสดงลิงก์ CardDav",
+"Show read-only VCF link" => "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น",
"Download" => "ดาวน์โหลด",
"Edit" => "แก้ไข",
"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
+"Name" => "ชื่อ",
+"Description" => "คำอธิบาย",
"Save" => "บันทึก",
-"Cancel" => "ยกเลิก"
+"Cancel" => "ยกเลิก",
+"More..." => "เพิ่มเติม..."
);
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 7ae80cd5cb0..8c38f1ba15d 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -600,6 +600,9 @@ class OC_Contacts_VCard{
}
}
}
+ if(is_string($value)) {
+ $value = strtr($value, array('\,' => ',', '\;' => ';'));
+ }
$temp = array(
'name' => $property->name,
'value' => $value,
@@ -637,7 +640,8 @@ class OC_Contacts_VCard{
* @return boolean
*
*/
- public static function moveToAddressBook($aid, $id) {
+ public static function moveToAddressBook($aid, $id, $isAddressbook = false) {
+ OC_Contacts_App::getAddressbook($aid); // check for user ownership.
$addressbook = OC_Contacts_Addressbook::find($aid);
if ($addressbook['userid'] != OCP\User::getUser()) {
$sharedAddressbook = OCP\Share::getItemSharedWithBySource('addressbook', $aid);
@@ -673,19 +677,24 @@ class OC_Contacts_VCard{
return false;
}
} else {
- $card = self::find($id);
- if (!$card) {
- return false;
- }
- $oldAddressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
- if ($oldAddressbook['userid'] != OCP\User::getUser()) {
- $sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
- if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+ $stmt = null;
+ if($isAddressbook) {
+ $stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE addressbookid = ?' );
+ } else {
+ $card = self::find($id);
+ if (!$card) {
return false;
}
+ $oldAddressbook = OC_Contacts_Addressbook::find($card['addressbookid']);
+ if ($oldAddressbook['userid'] != OCP\User::getUser()) {
+ $sharedContact = OCP\Share::getItemSharedWithBySource('contact', $id, OCP\Share::FORMAT_NONE, null, true);
+ if (!$sharedContact || !($sharedContact['permissions'] & OCP\Share::PERMISSION_DELETE)) {
+ return false;
+ }
+ }
+ $stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
}
try {
- $stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
$result = $stmt->execute(array($aid, $id));
} catch(Exception $e) {
OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 3670ce0389b..4d465e418cf 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -22,7 +22,6 @@ $id = isset($_['id']) ? $_['id'] : '';
<li><a class="svg cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
</ul>
</div>
- <img />
</div> <!-- contact_photo -->
<div id="contact_identity" class="contactsection">
diff --git a/apps/external/img/external.png b/apps/external/img/external.png
index 75d1366326b..9e56f2919fd 100644
--- a/apps/external/img/external.png
+++ b/apps/external/img/external.png
Binary files differ
diff --git a/apps/files/index.php b/apps/files/index.php
index 225e2d7ac13..6d53527025a 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -39,7 +39,7 @@ OCP\App::setActiveNavigationEntry( 'files_index' );
$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
// Redirect if directory does not exist
if(!OC_Filesystem::is_dir($dir.'/')) {
- header('Location: '.$_SERVER['PHP_SELF'].'');
+ header('Location: '.$_SERVER['SCRIPT_NAME'].'');
exit();
}
@@ -92,7 +92,7 @@ $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
$tmpl = new OCP\Template( 'files', 'index', 'user' );
$tmpl->assign( 'fileList', $list->fetchPage(), false );
$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
-$tmpl->assign( 'dir', $dir);
+$tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir));
$tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/'));
$tmpl->assign( 'files', $files );
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index ddaf923d1bd..adf8dc31704 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,7 +7,15 @@
"Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
"Failed to write to disk" => "Zápis na disk se nezdařil",
"Files" => "Soubory",
+"Unshare" => "Odsdílet",
"Delete" => "Vymazat",
+"already exists" => "již existuje",
+"replace" => "zaměnit",
+"cancel" => "storno",
+"replaced" => "zaměněno",
+"with" => "s",
+"undo" => "zpět",
+"deleted" => "smazáno",
"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to chvíli trvat",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemohu nahrát váš soubor neboť to je adresář a nebo má nulovou délku.",
"Upload Error" => "Chyba při nahrávání",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 0fd9e9a06c5..99ab3c124b4 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -9,6 +9,11 @@
"Files" => "Datoteke",
"Unshare" => "Vzemi iz souporabe",
"Delete" => "Izbriši",
+"already exists" => "že obstaja",
+"replace" => "nadomesti",
+"cancel" => "ekliči",
+"replaced" => "nadomeščen",
+"with" => "z",
"undo" => "razveljavi",
"deleted" => "izbrisano",
"generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 4299c31a45a..03a50fd711e 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,7 +7,15 @@
"Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
"Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
"Files" => "ไฟล์",
+"Unshare" => "ยกเลิกการแชร์ข้อมูล",
"Delete" => "ลบ",
+"already exists" => "มีอยู่แล้ว",
+"replace" => "แทนที่",
+"cancel" => "ยกเลิก",
+"replaced" => "แทนที่แล้ว",
+"with" => "กับ",
+"undo" => "เลิกทำ",
+"deleted" => "ลบแล้ว",
"generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
"Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 80693ba1d46..e4f015d40bd 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,7 +7,14 @@
"Missing a temporary folder" => "缺少临时目录",
"Failed to write to disk" => "写入磁盘失败",
"Files" => "文件",
+"Unshare" => "取消共享",
"Delete" => "删除",
+"already exists" => "已经存在",
+"replace" => "替换",
+"cancel" => "取消",
+"replaced" => "已经替换",
+"undo" => "撤销",
+"deleted" => "已经删除",
"generating ZIP-file, it may take some time." => "正在生成 ZIP 文件,可能需要一些时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
"Upload Error" => "上传错误",
diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
index 0723ae08ccf..3c14c3e1fdf 100644
--- a/apps/files_archive/lib/storage.php
+++ b/apps/files_archive/lib/storage.php
@@ -38,22 +38,30 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
return $this->archive->remove($path.'/');
}
public function opendir($path){
+ if(substr($path,-1)!=='/'){
+ $path.='/';
+ }
$path=$this->stripPath($path);
- $content=$this->archive->getFolder($path);
- foreach($content as &$file){
+ $files=$this->archive->getFolder($path);
+ $content=array();
+ foreach($files as $file){
if(substr($file,-1)=='/'){
$file=substr($file,0,-1);
}
+ if($file and strpos($file,'/')===false){
+ $content[]=$file;
+ }
}
$id=md5($this->path.$path);
OC_FakeDirStream::$dirs[$id]=$content;
return opendir('fakedir://'.$id);
}
public function stat($path){
- $ctime=filectime($this->path);
+ $ctime=-1;
$path=$this->stripPath($path);
if($path==''){
$stat=stat($this->path);
+ $stat['size']=0;
}else{
if($this->is_dir($path)){
$stat=array('size'=>0);
@@ -62,6 +70,9 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
$stat=array();
$stat['mtime']=$this->archive->mtime($path);
$stat['size']=$this->archive->filesize($path);
+ if(!$stat['mtime']){
+ $stat['mtime']=time();
+ }
}
}
$stat['ctime']=$ctime;
@@ -111,6 +122,19 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
return false;//not supported
}
}
+ private function toTmpFile($path){
+ $tmpFile=OC_Helper::tmpFile($extension);
+ $this->archive->extractFile($path,$tmpFile);
+ return $tmpFile;
+ }
+ public function file_put_contents($path,$data) {
+ $path=$this->stripPath($path);
+ return $this->archive->addFile($path,$data);
+ }
+ public function file_get_contents($path) {
+ $path=$this->stripPath($path);
+ return $this->archive->getFile($path);
+ }
/**
* automount paths from file hooks
@@ -143,4 +167,8 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
public function rename($path1,$path2){
return $this->archive->rename($path1,$path2);
}
+
+ public function hasUpdated($path,$time){
+ return $this->filemtime($this->path)>$time;
+ }
}
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
new file mode 100644
index 00000000000..15cf7705709
--- /dev/null
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptování",
+"Exclude the following file types from encryption" => "Při kryptování vynechat následující typy souborů",
+"None" => "Žádný",
+"Enable Encryption" => "Povolit kryptování"
+);
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
new file mode 100644
index 00000000000..af3c9ae98e4
--- /dev/null
+++ b/apps/files_encryption/l10n/eo.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Ĉifrado",
+"Exclude the following file types from encryption" => "Malinkluzivigi la jenajn dosiertipojn el ĉifrado",
+"None" => "Nenio",
+"Enable Encryption" => "Kapabligi ĉifradon"
+);
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
new file mode 100644
index 00000000000..a7cd9395bf0
--- /dev/null
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Krüpteerimine",
+"Exclude the following file types from encryption" => "Järgnevaid failitüüpe ära krüpteeri",
+"None" => "Pole",
+"Enable Encryption" => "Luba krüpteerimine"
+);
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
new file mode 100644
index 00000000000..5796499a26c
--- /dev/null
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Salaus",
+"Exclude the following file types from encryption" => "Jätä seuraavat tiedostotyypit salaamatta",
+"None" => "Ei mitään",
+"Enable Encryption" => "Käytä salausta"
+);
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
new file mode 100644
index 00000000000..c9367d1a312
--- /dev/null
+++ b/apps/files_encryption/l10n/fr.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Chiffrement",
+"Exclude the following file types from encryption" => "Ne pas chiffrer les fichiers dont les types sont les suivants",
+"None" => "Aucun",
+"Enable Encryption" => "Activer le chiffrement"
+);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
new file mode 100644
index 00000000000..5136b061797
--- /dev/null
+++ b/apps/files_encryption/l10n/it.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Cifratura",
+"Exclude the following file types from encryption" => "Escludi i seguenti tipi di file dalla cifratura",
+"None" => "Nessuna",
+"Enable Encryption" => "Abilita cifratura"
+);
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
new file mode 100644
index 00000000000..2c3e5410de3
--- /dev/null
+++ b/apps/files_encryption/l10n/ja_JP.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/sl.php b/apps/files_encryption/l10n/sl.php
new file mode 100644
index 00000000000..65807910e10
--- /dev/null
+++ b/apps/files_encryption/l10n/sl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Šifriranje",
+"Exclude the following file types from encryption" => "Naslednje vrste datotek naj se ne šifrirajo",
+"None" => "Brez",
+"Enable Encryption" => "Omogoči šifriranje"
+);
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
new file mode 100644
index 00000000000..c2685de6e3a
--- /dev/null
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "การเข้ารหัส",
+"Exclude the following file types from encryption" => "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส",
+"None" => "ไม่ต้อง",
+"Enable Encryption" => "เปิดใช้งานการเข้ารหัส"
+);
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
new file mode 100644
index 00000000000..45e5d32dfce
--- /dev/null
+++ b/apps/files_external/l10n/de.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externer Speicher",
+"Mount point" => "Mount-Point",
+"Backend" => "Backend",
+"Configuration" => "Konfiguration",
+"Options" => "Optionen",
+"Applicable" => "Zutreffend",
+"Add mount point" => "Mount-Point hinzufügen",
+"None set" => "Nicht definiert",
+"All Users" => "Alle Benutzer",
+"Groups" => "Gruppen",
+"Users" => "Benutzer",
+"Delete" => "Löschen",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren",
+"Enable User External Storage" => "Externer Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
+);
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
new file mode 100644
index 00000000000..3cb8255c522
--- /dev/null
+++ b/apps/files_external/l10n/eo.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Malena memorilo",
+"Mount point" => "Surmetingo",
+"Backend" => "Motoro",
+"Configuration" => "Agordo",
+"Options" => "Malneproj",
+"Applicable" => "Aplikebla",
+"Add mount point" => "Aldoni surmetingon",
+"None set" => "Nenio agordita",
+"All Users" => "Ĉiuj uzantoj",
+"Groups" => "Grupoj",
+"Users" => "Uzantoj",
+"Delete" => "Forigi",
+"SSL root certificates" => "Radikaj SSL-atestoj",
+"Import Root Certificate" => "Enporti radikan ateston",
+"Enable User External Storage" => "Kapabligi malenan memorilon de uzanto",
+"Allow users to mount their own external storage" => "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
+);
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
new file mode 100644
index 00000000000..a6907e775bc
--- /dev/null
+++ b/apps/files_external/l10n/et_EE.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Väline salvestuskoht",
+"Mount point" => "Ühenduspunkt",
+"Configuration" => "Seadistamine",
+"Options" => "Valikud",
+"Add mount point" => "Lisa ühenduspunkt",
+"None set" => "Pole määratud",
+"All Users" => "Kõik kasutajad",
+"Groups" => "Grupid",
+"Users" => "Kasutajad",
+"Delete" => "Kustuta"
+);
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
new file mode 100644
index 00000000000..7dca49791e4
--- /dev/null
+++ b/apps/files_external/l10n/fi_FI.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Erillinen tallennusväline",
+"Mount point" => "Liitospiste",
+"Backend" => "Taustaosa",
+"Configuration" => "Asetukset",
+"Options" => "Valinnat",
+"Add mount point" => "Lisää liitospiste",
+"None set" => "Ei asetettu",
+"All Users" => "Kaikki käyttäjät",
+"Groups" => "Ryhmät",
+"Users" => "Käyttäjät",
+"Delete" => "Poista",
+"SSL root certificates" => "SSL-juurivarmenteet",
+"Import Root Certificate" => "Tuo juurivarmenne",
+"Allow users to mount their own external storage" => "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
+);
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
new file mode 100644
index 00000000000..b3e76c63500
--- /dev/null
+++ b/apps/files_external/l10n/fr.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Stockage externe",
+"Mount point" => "Point de montage",
+"Backend" => "Infrastructure",
+"Configuration" => "Configuration",
+"Options" => "Options",
+"Applicable" => "Disponible",
+"Add mount point" => "Ajouter un point de montage",
+"None set" => "Aucun spécifié",
+"All Users" => "Tous les utilisateurs",
+"Groups" => "Groupes",
+"Users" => "Utilisateurs",
+"Delete" => "Supprimer",
+"SSL root certificates" => "Certificats racine SSL",
+"Import Root Certificate" => "Importer un certificat racine",
+"Enable User External Storage" => "Activer le stockage externe pour les utilisateurs",
+"Allow users to mount their own external storage" => "Autoriser les utilisateurs à monter leur propre stockage externe"
+);
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
new file mode 100644
index 00000000000..927499b0172
--- /dev/null
+++ b/apps/files_external/l10n/it.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Archiviazione esterna",
+"Mount point" => "Punto di mount",
+"Backend" => "Motore",
+"Configuration" => "Configurazione",
+"Options" => "Opzioni",
+"Applicable" => "Applicabile",
+"Add mount point" => "Aggiungi punto di mount",
+"None set" => "Nessuna impostazione",
+"All Users" => "Tutti gli utenti",
+"Groups" => "Gruppi",
+"Users" => "Utenti",
+"Delete" => "Elimina",
+"SSL root certificates" => "Certificato principale per SSL",
+"Import Root Certificate" => "Importa certificato principale",
+"Enable User External Storage" => "Abilita la memoria esterna dell'utente",
+"Allow users to mount their own external storage" => "Consente agli utenti di montare la propria memoria esterna"
+);
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
new file mode 100644
index 00000000000..c7d38d88321
--- /dev/null
+++ b/apps/files_external/l10n/ja_JP.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "外部ストレージ",
+"Mount point" => "マウントポイント",
+"Backend" => "バックエンド",
+"Configuration" => "設定",
+"Options" => "オプション",
+"Applicable" => "適用範囲",
+"Add mount point" => "マウントポイントを追加",
+"None set" => "未設定",
+"All Users" => "すべてのユーザ",
+"Groups" => "グループ",
+"Users" => "ユーザ",
+"Delete" => "削除",
+"SSL root certificates" => "SSLルート証明書",
+"Import Root Certificate" => "ルート証明書をインポート",
+"Enable User External Storage" => "ユーザの外部ストレージを有効にする",
+"Allow users to mount their own external storage" => "ユーザに外部ストレージのマウントを許可する"
+);
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
new file mode 100644
index 00000000000..d588844467e
--- /dev/null
+++ b/apps/files_external/l10n/sl.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Zunanja podatkovna shramba",
+"Mount point" => "Priklopna točka",
+"Backend" => "Zaledje",
+"Configuration" => "Nastavitve",
+"Options" => "Možnosti",
+"Applicable" => "Se uporablja",
+"Add mount point" => "Dodaj priklopno točko",
+"None set" => "Ni nastavljeno",
+"All Users" => "Vsi uporabniki",
+"Groups" => "Skupine",
+"Users" => "Uporabniki",
+"Delete" => "Izbriši",
+"SSL root certificates" => "SSL korenski certifikati",
+"Import Root Certificate" => "Uvozi korenski certifikat",
+"Enable User External Storage" => "Omogoči uporabo zunanje podatkovne shrambe za uporabnike",
+"Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
+);
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
new file mode 100644
index 00000000000..84a233046eb
--- /dev/null
+++ b/apps/files_external/l10n/th_TH.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+"Mount point" => "จุดชี้ตำแหน่ง",
+"Backend" => "ด้านหลังระบบ",
+"Configuration" => "การกำหนดค่า",
+"Options" => "ตัวเลือก",
+"Applicable" => "สามารถใช้งานได้",
+"Add mount point" => "เพิ่มจุดชี้ตำแหน่ง",
+"None set" => "ยังไม่มีการกำหนด",
+"All Users" => "ผู้ใช้งานทั้งหมด",
+"Groups" => "กลุ่ม",
+"Users" => "ผู้ใช้งาน",
+"Delete" => "ลบ",
+"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+"Enable User External Storage" => "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
+"Allow users to mount their own external storage" => "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
+);
diff --git a/apps/files_imageviewer/img/fancybox-y.png b/apps/files_imageviewer/img/fancybox-y.png
index 7ef399b9908..62f31761998 100644
--- a/apps/files_imageviewer/img/fancybox-y.png
+++ b/apps/files_imageviewer/img/fancybox-y.png
Binary files differ
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
new file mode 100644
index 00000000000..6817d07a47d
--- /dev/null
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vaše sdílené soubory",
+"Item" => "Položka",
+"Shared With" => "Sdíleno s:",
+"Permissions" => "Práva",
+"Read" => "Číst",
+"Edit" => "Editovat",
+"Delete" => "Smazat",
+"Enable Resharing" => "Povolit další sdílení",
+"Allow users to reshare files they don't own" => "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
+);
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
new file mode 100644
index 00000000000..d0526c0f3cf
--- /dev/null
+++ b/apps/files_sharing/l10n/de.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Ihre geteilten Dateien",
+"Item" => "Objekt",
+"Shared With" => "Teilen mit",
+"Permissions" => "Berechtigungen",
+"Read" => "Lesen",
+"Edit" => "Bearbeiten",
+"Delete" => "Löschen",
+"Enable Resharing" => "Austausch ermöglichen",
+"Allow users to reshare files they don't own" => "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
+);
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
new file mode 100644
index 00000000000..6af1ef53d08
--- /dev/null
+++ b/apps/files_sharing/l10n/eo.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Viaj kunhavigitaj dosieroj",
+"Item" => "Ero",
+"Shared With" => "Kunhavigita kun",
+"Permissions" => "Permesoj",
+"Read" => "Legi",
+"Edit" => "Redakti",
+"Delete" => "Forigi",
+"Enable Resharing" => "Kapabligi rekunhavigon",
+"Allow users to reshare files they don't own" => "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
+);
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
new file mode 100644
index 00000000000..bdfa215e1db
--- /dev/null
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Sinu jagatud failid",
+"Item" => "Kirje",
+"Shared With" => "Kellega jagatud",
+"Permissions" => "Õigused",
+"Read" => "Lugemine",
+"Edit" => "Muutmine",
+"Delete" => "Kustutamine",
+"Enable Resharing" => "Luba edasijagamine",
+"Allow users to reshare files they don't own" => "Luba kasutajatel jagada faile, mis pole nende omad"
+);
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
new file mode 100644
index 00000000000..de25ecf1083
--- /dev/null
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Jakamasi tiedostot",
+"Permissions" => "Oikeudet",
+"Read" => "Luku",
+"Edit" => "Muokkaus",
+"Delete" => "Poisto",
+"Enable Resharing" => "Käytä uudelleenjakoa",
+"Allow users to reshare files they don't own" => "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
+);
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
new file mode 100644
index 00000000000..47219c00804
--- /dev/null
+++ b/apps/files_sharing/l10n/fr.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vos documents partagés",
+"Item" => "Item",
+"Shared With" => "Partagé avec",
+"Permissions" => "Permissions",
+"Read" => "Lecture",
+"Edit" => "Édition",
+"Delete" => "Effacement",
+"Enable Resharing" => "Permettre le repartage",
+"Allow users to reshare files they don't own" => "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
+);
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
new file mode 100644
index 00000000000..8dc20efdf7c
--- /dev/null
+++ b/apps/files_sharing/l10n/it.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "I tuoi file condivisi",
+"Item" => "Elemento",
+"Shared With" => "Condiviso con",
+"Permissions" => "Permessi",
+"Read" => "Lettura",
+"Edit" => "Modifica",
+"Delete" => "Eliminazione",
+"Enable Resharing" => "Abilita ri-condivisione",
+"Allow users to reshare files they don't own" => "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
+);
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
new file mode 100644
index 00000000000..bc58aa98633
--- /dev/null
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "共有ファイル",
+"Item" => "項目",
+"Shared With" => "で共有 ",
+"Permissions" => "許可",
+"Read" => "読込",
+"Edit" => "編集",
+"Delete" => "削除",
+"Enable Resharing" => "再共有を有効にする",
+"Allow users to reshare files they don't own" => "所有者でないファイルの共有を許可する"
+);
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
new file mode 100644
index 00000000000..a2a1a2b1a9a
--- /dev/null
+++ b/apps/files_sharing/l10n/sl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Vaše datoteke v souporabi",
+"Item" => "Predmet",
+"Shared With" => "V souporabi z",
+"Permissions" => "Dovoljenja",
+"Read" => "Branje",
+"Edit" => "Pisanje",
+"Delete" => "Izbris",
+"Enable Resharing" => "Omogoči nadaljnjo izmenjavo",
+"Allow users to reshare files they don't own" => "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
+);
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
new file mode 100644
index 00000000000..2ff91112344
--- /dev/null
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "ไฟล์ของคุณที่แชร์ไว้",
+"Item" => "ไอเท็ม",
+"Shared With" => "แชร์พร้อมกับ",
+"Permissions" => "สิทธิ์การเข้าใช้งาน",
+"Read" => "อ่าน",
+"Edit" => "แก้ไข",
+"Delete" => "ลบ",
+"Enable Resharing" => "เปิดให้มีการแชร์ใหม่อีกครั้งได้",
+"Allow users to reshare files they don't own" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
+);
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
new file mode 100644
index 00000000000..3297648fa30
--- /dev/null
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Vypršení všech verzí",
+"Enable Files Versioning" => "Povolit verzování souborů"
+);
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
new file mode 100644
index 00000000000..3d1a0a43f5e
--- /dev/null
+++ b/apps/files_versions/l10n/de.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Alle Versionen löschen",
+"Enable Files Versioning" => "Datei-Versionierung aktivieren"
+);
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
new file mode 100644
index 00000000000..8ec0895638a
--- /dev/null
+++ b/apps/files_versions/l10n/eo.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Eksvalidigi ĉiujn eldonojn",
+"Enable Files Versioning" => "Kapabligi dosiereldonkontrolon"
+);
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
new file mode 100644
index 00000000000..d136ae241ce
--- /dev/null
+++ b/apps/files_versions/l10n/et_EE.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Kõikide versioonide aegumine",
+"Enable Files Versioning" => "Luba failide versioonihaldus"
+);
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
new file mode 100644
index 00000000000..c5092daf998
--- /dev/null
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Vanhenna kaikki versiot",
+"Enable Files Versioning" => "Käytä tiedostojen versiointia"
+);
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
new file mode 100644
index 00000000000..02209f543b1
--- /dev/null
+++ b/apps/files_versions/l10n/fr.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Supprimer les versions intermédiaires",
+"Enable Files Versioning" => "Activer le versionnage"
+);
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
new file mode 100644
index 00000000000..9711ce18aa8
--- /dev/null
+++ b/apps/files_versions/l10n/it.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Scadenza di tutte le versioni",
+"Enable Files Versioning" => "Abilita controllo di versione"
+);
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
new file mode 100644
index 00000000000..ec5e32f3e29
--- /dev/null
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "すべてのバージョンを削除する",
+"Enable Files Versioning" => "ファイルのバージョン管理を有効にする"
+);
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
new file mode 100644
index 00000000000..e7db55930c1
--- /dev/null
+++ b/apps/files_versions/l10n/sl.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Zastaraj vse različice",
+"Enable Files Versioning" => "Omogoči sledenje različicam datotek"
+);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
new file mode 100644
index 00000000000..e880840f4b9
--- /dev/null
+++ b/apps/files_versions/l10n/th_TH.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "หมดอายุทุกรุ่น",
+"Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
+);
diff --git a/apps/gallery/img/breadcrumb.png b/apps/gallery/img/breadcrumb.png
index a252a751554..adbef1e576d 100644
--- a/apps/gallery/img/breadcrumb.png
+++ b/apps/gallery/img/breadcrumb.png
Binary files differ
diff --git a/apps/gallery/img/delete.png b/apps/gallery/img/delete.png
index bc0c782882d..fa8e18183ed 100644
--- a/apps/gallery/img/delete.png
+++ b/apps/gallery/img/delete.png
Binary files differ
diff --git a/apps/gallery/img/rename.png b/apps/gallery/img/rename.png
index 9993a092df1..3af6840071b 100644
--- a/apps/gallery/img/rename.png
+++ b/apps/gallery/img/rename.png
Binary files differ
diff --git a/apps/gallery/img/share.png b/apps/gallery/img/share.png
index 62c4627f317..099e4d6ab35 100644
--- a/apps/gallery/img/share.png
+++ b/apps/gallery/img/share.png
Binary files differ
diff --git a/apps/gallery/img/supersized/back.png b/apps/gallery/img/supersized/back.png
index 44cd0ae703c..f0e809ece09 100644
--- a/apps/gallery/img/supersized/back.png
+++ b/apps/gallery/img/supersized/back.png
Binary files differ
diff --git a/apps/gallery/img/supersized/bg-black.png b/apps/gallery/img/supersized/bg-black.png
index 8c2f00140d6..e7ce54412b8 100644
--- a/apps/gallery/img/supersized/bg-black.png
+++ b/apps/gallery/img/supersized/bg-black.png
Binary files differ
diff --git a/apps/gallery/img/supersized/button-tray-down.png b/apps/gallery/img/supersized/button-tray-down.png
index 99b92aef122..15645ae34ef 100644
--- a/apps/gallery/img/supersized/button-tray-down.png
+++ b/apps/gallery/img/supersized/button-tray-down.png
Binary files differ
diff --git a/apps/gallery/img/supersized/button-tray-up.png b/apps/gallery/img/supersized/button-tray-up.png
index 7cc57785f0a..0ee91d25ba0 100644
--- a/apps/gallery/img/supersized/button-tray-up.png
+++ b/apps/gallery/img/supersized/button-tray-up.png
Binary files differ
diff --git a/apps/gallery/img/supersized/forward.png b/apps/gallery/img/supersized/forward.png
index e2084ab3faf..a6408f75118 100644
--- a/apps/gallery/img/supersized/forward.png
+++ b/apps/gallery/img/supersized/forward.png
Binary files differ
diff --git a/apps/gallery/img/supersized/nav-bg.png b/apps/gallery/img/supersized/nav-bg.png
index 800f904ddc7..c1a9fc170f4 100644
--- a/apps/gallery/img/supersized/nav-bg.png
+++ b/apps/gallery/img/supersized/nav-bg.png
Binary files differ
diff --git a/apps/gallery/img/supersized/nav-dot.png b/apps/gallery/img/supersized/nav-dot.png
index a28a50789f3..4319ed04213 100644
--- a/apps/gallery/img/supersized/nav-dot.png
+++ b/apps/gallery/img/supersized/nav-dot.png
Binary files differ
diff --git a/apps/gallery/img/supersized/pause.png b/apps/gallery/img/supersized/pause.png
index a2c21a51cee..1e81d1856b6 100644
--- a/apps/gallery/img/supersized/pause.png
+++ b/apps/gallery/img/supersized/pause.png
Binary files differ
diff --git a/apps/gallery/img/supersized/play.png b/apps/gallery/img/supersized/play.png
index 16e53f86745..df94a034986 100644
--- a/apps/gallery/img/supersized/play.png
+++ b/apps/gallery/img/supersized/play.png
Binary files differ
diff --git a/apps/gallery/img/supersized/progress-back.png b/apps/gallery/img/supersized/progress-back.png
index 68cd45b6706..95992f1410c 100644
--- a/apps/gallery/img/supersized/progress-back.png
+++ b/apps/gallery/img/supersized/progress-back.png
Binary files differ
diff --git a/apps/gallery/img/supersized/progress-bar.png b/apps/gallery/img/supersized/progress-bar.png
index 49ebb0513b7..9758d178831 100644
--- a/apps/gallery/img/supersized/progress-bar.png
+++ b/apps/gallery/img/supersized/progress-bar.png
Binary files differ
diff --git a/apps/gallery/img/supersized/supersized-logo.png b/apps/gallery/img/supersized/supersized-logo.png
index b1243a29784..cc106293292 100644
--- a/apps/gallery/img/supersized/supersized-logo.png
+++ b/apps/gallery/img/supersized/supersized-logo.png
Binary files differ
diff --git a/apps/gallery/img/supersized/thumb-back.png b/apps/gallery/img/supersized/thumb-back.png
index 3c969ebd527..b86a9110ee4 100644
--- a/apps/gallery/img/supersized/thumb-back.png
+++ b/apps/gallery/img/supersized/thumb-back.png
Binary files differ
diff --git a/apps/gallery/img/supersized/thumb-forward.png b/apps/gallery/img/supersized/thumb-forward.png
index afe451c75d0..bff5ec1108a 100644
--- a/apps/gallery/img/supersized/thumb-forward.png
+++ b/apps/gallery/img/supersized/thumb-forward.png
Binary files differ
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
index d008e9d28b3..02d1c02d6e9 100644
--- a/apps/gallery/l10n/cs_CZ.php
+++ b/apps/gallery/l10n/cs_CZ.php
@@ -1,12 +1,7 @@
<?php $TRANSLATIONS = array(
"Pictures" => "Obrázky",
-"Settings" => "Nastavení",
-"Rescan" => "Znovu prohledat",
-"Stop" => "Zastavit",
-"Share" => "Sdílet",
-"Back" => "Zpět",
-"Remove confirmation" => "Potvrzení odebrání",
-"Do you want to remove album" => "Chcete odstranit album?",
-"Change album name" => "Změnit název alba",
-"New album name" => "Název nového alba"
+"Share gallery" => "Sdílet galerii",
+"Error: " => "Chyba: ",
+"Internal error" => "Vnitřní chyba",
+"Slideshow" => "Přehrávání"
);
diff --git a/apps/gallery/l10n/th_TH.php b/apps/gallery/l10n/th_TH.php
index 34da8dc57fb..9bb699e2644 100644
--- a/apps/gallery/l10n/th_TH.php
+++ b/apps/gallery/l10n/th_TH.php
@@ -1,12 +1,7 @@
<?php $TRANSLATIONS = array(
"Pictures" => "รูปภาพ",
-"Settings" => "ตั้งค่า",
-"Rescan" => "ตรวจสอบอีกครั้ง",
-"Stop" => "หยุด",
-"Share" => "แชร์",
-"Back" => "ย้อนกลับ",
-"Remove confirmation" => "การยืนยันการลบ",
-"Do you want to remove album" => "คุณต้องการลบอัลบั้มออกหรือไม่",
-"Change album name" => "เปลี่ยนชื่ออัลบั้ม",
-"New album name" => "ชื่อใหม่ของอัลบั้ม"
+"Share gallery" => "แชร์ข้อมูลแกลอรี่",
+"Error: " => "พบข้อผิดพลาด: ",
+"Internal error" => "เกิดข้อผิดพลาดภายในระบบ",
+"Slideshow" => "ภาพสไลด์โชว์"
);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
index ffa321f7de6..6aa4fc7f353 100644
--- a/apps/gallery/l10n/zh_CN.php
+++ b/apps/gallery/l10n/zh_CN.php
@@ -1,12 +1,7 @@
<?php $TRANSLATIONS = array(
"Pictures" => "图片",
-"Settings" => "设置",
-"Rescan" => "重新扫描",
-"Stop" => "停止",
-"Share" => "分享",
-"Back" => "返回",
-"Remove confirmation" => "移除确认",
-"Do you want to remove album" => "您是否想要移除相册",
-"Change album name" => "修改相册名称",
-"New album name" => "新相册名称"
+"Share gallery" => "分享图库",
+"Error: " => "错误:",
+"Internal error" => "内部错误",
+"Slideshow" => "幻灯片"
);
diff --git a/apps/media/l10n/eo.php b/apps/media/l10n/eo.php
index 429247bbc33..084dbaa480e 100644
--- a/apps/media/l10n/eo.php
+++ b/apps/media/l10n/eo.php
@@ -1,9 +1,10 @@
<?php $TRANSLATIONS = array(
"Music" => "Muziko",
+"Add album to playlist" => "Aldoni albumon al ludlisto",
"Play" => "Ludi",
"Pause" => "Paŭzigi",
-"Previous" => "Antaŭa",
-"Next" => "Sekva",
+"Previous" => "Maljena",
+"Next" => "Jena",
"Mute" => "Silentigi",
"Unmute" => "Malsilentigi",
"Rescan Collection" => "Reskani la aron",
diff --git a/apps/remoteStorage/img/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
index 6b751c09997..10c2be243c2 100644
--- a/apps/remoteStorage/img/remoteStorage.png
+++ b/apps/remoteStorage/img/remoteStorage.png
Binary files differ
diff --git a/apps/tasks/img/icon.png b/apps/tasks/img/icon.png
index df281f3ba86..e2802ae9387 100644
--- a/apps/tasks/img/icon.png
+++ b/apps/tasks/img/icon.png
Binary files differ
diff --git a/apps/tasks/l10n/de.php b/apps/tasks/l10n/de.php
new file mode 100644
index 00000000000..50d0041d209
--- /dev/null
+++ b/apps/tasks/l10n/de.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Datum/Uhrzeit ungültig",
+"Tasks" => "Aufgaben",
+"No category" => "Keine Kategorie",
+"Unspecified" => "Nicht angegeben",
+"1=highest" => "1=am höchsten",
+"5=medium" => "5=Durchschnitt",
+"9=lowest" => "9=am niedrigsten",
+"Empty Summary" => "Leere Zusammenfassung",
+"Invalid percent complete" => "Ungültige Prozent abgeschlossen",
+"Invalid priority" => "Falsche Priorität",
+"Add Task" => "Aufgabe hinzufügen",
+"Order Due" => "Nach Fälligkeit sortieren",
+"Order List" => "Nach Kategorie sortieren ",
+"Order Complete" => "Nach Fertigstellung sortieren",
+"Order Location" => "Nach Ort sortieren",
+"Order Priority" => "Nach Priorität sortieren",
+"Order Label" => "Nach Label sortieren",
+"Loading tasks..." => "Lade Aufgaben...",
+"Important" => "Wichtig",
+"More" => "Mehr",
+"Less" => "Weniger",
+"Delete" => "Löschen"
+);
diff --git a/apps/tasks/l10n/eo.php b/apps/tasks/l10n/eo.php
new file mode 100644
index 00000000000..9919a6ea63e
--- /dev/null
+++ b/apps/tasks/l10n/eo.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Nevalida dato/horo",
+"Tasks" => "Taskoj",
+"No category" => "Neniu kategorio",
+"Unspecified" => "Nespecifita",
+"1=highest" => "1=plej alta",
+"5=medium" => "5=meza",
+"9=lowest" => "9=plej malalta",
+"Empty Summary" => "Malplena resumo",
+"Invalid percent complete" => "Nevalida plenuma elcento",
+"Invalid priority" => "Nevalida pligravo",
+"Add Task" => "Aldoni taskon",
+"Order Due" => "Ordigi laŭ limdato",
+"Order List" => "Ordigi laŭ listo",
+"Order Complete" => "Ordigi laŭ plenumo",
+"Order Location" => "Ordigi laŭ loko",
+"Order Priority" => "Ordigi laŭ pligravo",
+"Order Label" => "Ordigi laŭ etikedo",
+"Loading tasks..." => "Ŝargante taskojn...",
+"Important" => "Grava",
+"More" => "Pli",
+"Less" => "Malpli",
+"Delete" => "Forigi"
+);
diff --git a/apps/tasks/l10n/es.php b/apps/tasks/l10n/es.php
new file mode 100644
index 00000000000..e5f0981de55
--- /dev/null
+++ b/apps/tasks/l10n/es.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Fecha/hora inválida",
+"Tasks" => "Tareas",
+"No category" => "Sin categoría",
+"Unspecified" => "Sin especificar",
+"1=highest" => "1=mayor",
+"5=medium" => "5=media",
+"9=lowest" => "9=menor",
+"Empty Summary" => "Resumen vacío",
+"Invalid percent complete" => "Porcentaje completado inválido",
+"Invalid priority" => "Prioridad inválida",
+"Add Task" => "Agregar tarea",
+"Order Due" => "Ordenar por",
+"Order List" => "Ordenar por lista",
+"Order Complete" => "Ordenar por completadas",
+"Order Location" => "Ordenar por ubicación",
+"Order Priority" => "Ordenar por prioridad",
+"Order Label" => "Ordenar por etiqueta",
+"Loading tasks..." => "Cargando tareas...",
+"Important" => "Importante",
+"More" => "Más",
+"Less" => "Menos",
+"Delete" => "Borrar"
+);
diff --git a/apps/tasks/l10n/et_EE.php b/apps/tasks/l10n/et_EE.php
new file mode 100644
index 00000000000..56db6ee0327
--- /dev/null
+++ b/apps/tasks/l10n/et_EE.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Vigane kuupäev/kellaaeg",
+"Tasks" => "Ülesanded",
+"No category" => "Kategooriat pole",
+"Unspecified" => "Määramata",
+"1=highest" => "1=kõrgeim",
+"5=medium" => "5=keskmine",
+"9=lowest" => "9=madalaim",
+"Empty Summary" => "Tühi kokkuvõte",
+"Invalid percent complete" => "Vigane edenemise protsent",
+"Invalid priority" => "Vigane tähtsus",
+"Add Task" => "Lisa ülesanne",
+"Order Due" => "Tähtaja järgi",
+"Order List" => "Nimekirja järgi",
+"Order Complete" => "Edenemise järgi",
+"Order Location" => "Asukoha järgi",
+"Order Priority" => "Tähtsuse järjekorras",
+"Order Label" => "Sildi järgi",
+"Loading tasks..." => "Ülesannete laadimine...",
+"Important" => "Tähtis",
+"More" => "Rohkem",
+"Less" => "Vähem",
+"Delete" => "Kustuta"
+);
diff --git a/apps/tasks/l10n/fi_FI.php b/apps/tasks/l10n/fi_FI.php
new file mode 100644
index 00000000000..c270951c116
--- /dev/null
+++ b/apps/tasks/l10n/fi_FI.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Virheellinen päivä tai aika",
+"Tasks" => "Tehtävät",
+"Unspecified" => "Määrittelemätön",
+"1=highest" => "1=korkein",
+"5=medium" => "5=keskitaso",
+"9=lowest" => "9=matalin",
+"Invalid priority" => "Virheellinen prioriteetti",
+"Add Task" => "Lisää tehtävä",
+"Loading tasks..." => "Ladataan tehtäviä...",
+"More" => "Enemmän",
+"Less" => "Vähemmän",
+"Delete" => "Poista"
+);
diff --git a/apps/tasks/l10n/fr.php b/apps/tasks/l10n/fr.php
new file mode 100644
index 00000000000..5b0a0321a87
--- /dev/null
+++ b/apps/tasks/l10n/fr.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "date/heure invalide",
+"Tasks" => "Tâches",
+"No category" => "Sans catégorie",
+"Unspecified" => "Non spécifié",
+"1=highest" => "1=le plus important",
+"5=medium" => "5=importance moyenne",
+"9=lowest" => "9=le moins important",
+"Empty Summary" => "Résumé vide",
+"Invalid percent complete" => "Pourcentage d'achèvement invalide",
+"Invalid priority" => "Priorité invalide",
+"Add Task" => "Ajouter une tâche",
+"Order Due" => "Echéance tâche",
+"Order List" => "Liste tâche",
+"Order Complete" => "Tâche réalisée",
+"Order Location" => "Lieu",
+"Order Priority" => "Priorité",
+"Order Label" => "Etiquette tâche",
+"Loading tasks..." => "Chargement des tâches…",
+"Important" => "Important",
+"More" => "Plus",
+"Less" => "Moins",
+"Delete" => "Supprimer"
+);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
new file mode 100644
index 00000000000..1aac8aac886
--- /dev/null
+++ b/apps/tasks/l10n/it.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Ora/Data non valida",
+"Tasks" => "Attività",
+"No category" => "Nessuna categoria",
+"Unspecified" => "Non specificata",
+"1=highest" => "1=massima",
+"5=medium" => "5=media",
+"9=lowest" => "9=minima",
+"Empty Summary" => "Riepilogo vuoto",
+"Invalid percent complete" => "Percentuale di completamento non valida",
+"Invalid priority" => "Priorità non valida",
+"Add Task" => "Aggiungi attività",
+"Order Due" => "Ordina per scadenza",
+"Order List" => "Ordina per elenco",
+"Order Complete" => "Ordina per completamento",
+"Order Location" => "Ordina per posizione",
+"Order Priority" => "Ordina per priorità",
+"Order Label" => "Ordina per etichetta",
+"Loading tasks..." => "Caricamento attività in corso...",
+"Important" => "Importante",
+"More" => "Più",
+"Less" => "Meno",
+"Delete" => "Elimina"
+);
diff --git a/apps/tasks/l10n/ja_JP.php b/apps/tasks/l10n/ja_JP.php
new file mode 100644
index 00000000000..b5b526c595a
--- /dev/null
+++ b/apps/tasks/l10n/ja_JP.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "無効な日付/時刻",
+"Tasks" => "タスク",
+"No category" => "カテゴリ無し",
+"Unspecified" => "未指定",
+"1=highest" => "1=高",
+"5=medium" => "5=中",
+"9=lowest" => "9=低",
+"Empty Summary" => "要旨が未記入",
+"Invalid percent complete" => "進捗%が不正",
+"Invalid priority" => "無効な優先度",
+"Add Task" => "タスクを追加",
+"Order Due" => "期日で並べ替え",
+"Order List" => "リストで並び替え",
+"Order Complete" => "完了で並べ替え",
+"Order Location" => "場所で並べ替え",
+"Order Priority" => "優先度で並べ替え",
+"Order Label" => "ラベルで並べ替え",
+"Loading tasks..." => "タスクをロード中...",
+"Important" => "重要",
+"More" => "詳細",
+"Less" => "閉じる",
+"Delete" => "削除"
+);
diff --git a/apps/tasks/l10n/ro.php b/apps/tasks/l10n/ro.php
new file mode 100644
index 00000000000..54958582f5b
--- /dev/null
+++ b/apps/tasks/l10n/ro.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Data/timpul invalid",
+"Tasks" => "Sarcini",
+"No category" => "Fără categorie",
+"Unspecified" => "Nespecificat",
+"1=highest" => "1=cel mai înalt",
+"5=medium" => "5=mediu",
+"9=lowest" => "9=cel mai jos",
+"Empty Summary" => "Rezumat gol",
+"Invalid percent complete" => "Completare procentuală greșită",
+"Invalid priority" => "Prioritare greșită",
+"Add Task" => "Adaugă sarcină",
+"Order Due" => "Comandă până la",
+"Order List" => "Lista de comenzi",
+"Order Complete" => "Comandă executată",
+"Order Location" => "Locația comenzii",
+"Order Priority" => "Prioritarea comenzii",
+"Order Label" => "Eticheta comenzii",
+"Loading tasks..." => "Încărcare sarcini",
+"Important" => "Important",
+"More" => "Mai mult",
+"Less" => "Mai puțin",
+"Delete" => "Șterge"
+);
diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php
new file mode 100644
index 00000000000..3dff6b22a03
--- /dev/null
+++ b/apps/tasks/l10n/sl.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "Neveljaven datum/čas",
+"Tasks" => "Opravila",
+"No category" => "Ni kategorije",
+"Unspecified" => "Nedoločen",
+"1=highest" => "1=najvišje",
+"5=medium" => "5=srednje",
+"9=lowest" => "9=najnižje",
+"Empty Summary" => "Prazen povzetek",
+"Invalid percent complete" => "Neveljaven odstotek dokončanja",
+"Invalid priority" => "Neveljavna prednost",
+"Add Task" => "Dodaj opravilo",
+"Loading tasks..." => "Nalagam opravila...",
+"Important" => "Pomembno",
+"More" => "Več",
+"Less" => "Manj",
+"Delete" => "Izbriši"
+);
diff --git a/apps/tasks/l10n/th_TH.php b/apps/tasks/l10n/th_TH.php
new file mode 100644
index 00000000000..e4212bf291c
--- /dev/null
+++ b/apps/tasks/l10n/th_TH.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Invalid date/time" => "วันที่ / เวลา ไม่ถูกต้อง",
+"Tasks" => "งาน",
+"No category" => "ไม่มีหมวดหมู่",
+"Unspecified" => "ยังไม่ได้ระบุ",
+"1=highest" => "1=สูงสุด",
+"5=medium" => "5=ปานกลาง",
+"9=lowest" => "9=ต่ำสุด",
+"Empty Summary" => "ข้อมูลสรุปยังว่างอยู่",
+"Invalid percent complete" => "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง",
+"Invalid priority" => "ความสำคัญไม่ถูกต้อง",
+"Add Task" => "เพิ่มงานใหม่",
+"Order Due" => "จัดเรียงตามกำหนดเวลา",
+"Order List" => "จัดเรียงตามรายชื่อ",
+"Order Complete" => "จัดเรียงตามความสมบูรณ์",
+"Order Location" => "จัดเรียงตามตำแหน่งที่อยู่",
+"Order Priority" => "จัดเรียงตามระดับความสำคัญ",
+"Order Label" => "จัดเรียงตามป้ายชื่อ",
+"Loading tasks..." => "กำลังโหลดข้อมูลงาน...",
+"Important" => "สำคัญ",
+"More" => "มาก",
+"Less" => "น้อย",
+"Delete" => "ลบ"
+);
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
new file mode 100644
index 00000000000..6c0f227fa7a
--- /dev/null
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Hostitel",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Nelze vynechat protokol vyžadující SSL. Začněte s ldaps://",
+"Base DN" => "Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "V Rozšířeném nastavení můžete specifikovat pro své uživatele a skupiny element Base DN",
+"User DN" => "DN uživatele",
+"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 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é.",
+"Password" => "Heslo",
+"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and Heslo prázdné.",
+"User Login Filter" => "Filtr uživatelských loginů",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definuje filtr, který je aplikován v průběhu logování. %%uid nahrazuje uživatelské jméno během logování.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použijte %%uid pro rezervované místo, např. \"uid=%%uid\"",
+"User List Filter" => "Filtr uživateslkých seznamů",
+"Defines the filter to apply, when retrieving users." => "Defunije filtr, který je plaikován při návratu uživatelů.",
+"without any placeholder, e.g. \"objectClass=person\"." => "bez rezervace místa, např. \"objectClass=person\".",
+"Group Filter" => "Filtr skupiny",
+"Defines the filter to apply, when retrieving groups." => "Definuje filtr, který je aplikován při návratu skupin",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez rezervace místa, např. \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Base User Tree" => "Základní uživatelský strom",
+"Base Group Tree" => "Základní skupinový strom",
+"Group-Member association" => "Asociace člena skupiny",
+"Use TLS" => "Použijte TLS",
+"Do not use it for SSL connections, it will fail." => "Nepoužívejte pro SSL připojení, připojení selže.",
+"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)",
+"Turn off SSL certificate validation." => "Vypněte ověřování SSL certifikátu",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "pokud pracuje připojení pouze pokud je teto volba aktivní, importujte SSL certifikát LDAP serveru do Vašeho serveru ownCloud.",
+"Not recommended, use for testing only." => "Není doporučeno, pouze pro účely testování.",
+"User Display Name Field" => "Pole pro zobrazované jméno uživatele",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP použitý k vytvoření jména uživatele ownCloud",
+"Group Display Name Field" => "Pole pro zobrazení jména skupiny",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP použitý k vytvoření jména skupiny ownCloud",
+"in bytes" => "v bytech",
+"in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní dočasnou paměť.",
+"Help" => "Nápověda"
+);
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
new file mode 100644
index 00000000000..14361171844
--- /dev/null
+++ b/apps/user_ldap/l10n/de.php
@@ -0,0 +1,20 @@
+<?php $TRANSLATIONS = array(
+"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ötiogst. Beginne dann __mit__ ldaps://",
+"Base DN" => "Basis-DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+"User DN" => "Benutzer-DN",
+"Password" => "Passwort",
+"For anonymous access, leave DN and Password empty." => "Lass die Felder von DN und Passwort für anonymen Zugang leer.",
+"User Login Filter" => "Benutzer Login Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
+"User List Filter" => "Benutzer Filter Liste",
+"Group Filter" => "Gruppen Filter",
+"Port" => "Port",
+"Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern.",
+"Turn off SSL certificate validation." => "Schalte die SSL Zertifikatsprüfung aus.",
+"in bytes" => "in bytes",
+"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
+"Help" => "Hilfe"
+);
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
new file mode 100644
index 00000000000..6f18506b095
--- /dev/null
+++ b/apps/user_ldap/l10n/eo.php
@@ -0,0 +1,32 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Gastigo",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
+"Base DN" => "Baz-DN",
+"User DN" => "Uzanto-DN",
+"Password" => "Pasvorto",
+"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
+"User Login Filter" => "Filtrilo de uzantensaluto",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uzu la referencilon %%uid, ekz.: \"uid=%%uid\"",
+"User List Filter" => "Filtrilo de uzantolisto",
+"Defines the filter to apply, when retrieving users." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj.",
+"without any placeholder, e.g. \"objectClass=person\"." => "sen ajna referencilo, ekz.: \"objectClass=person\".",
+"Group Filter" => "Filtrilo de grupo",
+"Defines the filter to apply, when retrieving groups." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ajna referencilo, ekz.: \"objectClass=posixGroup\".",
+"Port" => "Pordo",
+"Base User Tree" => "Baza uzantarbo",
+"Base Group Tree" => "Baza gruparbo",
+"Use TLS" => "Uzi TLS-on",
+"Do not use it for SSL connections, it will fail." => "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos.",
+"Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
+"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
+"Not recommended, use for testing only." => "Ne rekomendata, uzu ĝin nur por testoj.",
+"User Display Name Field" => "Kampo de vidignomo de uzanto",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto.",
+"Group Display Name Field" => "Kampo de vidignomo de grupo",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo.",
+"in bytes" => "duumoke",
+"in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
+"Help" => "Helpo"
+);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
new file mode 100644
index 00000000000..c2222f104ed
--- /dev/null
+++ b/apps/user_ldap/l10n/fr.php
@@ -0,0 +1,30 @@
+<?php $TRANSLATIONS = array(
+"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 de base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé",
+"User DN" => "DN Utilisateur",
+"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." => "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.",
+"Password" => "Mot de passe",
+"For anonymous access, leave DN and Password empty." => "Pour l'accès anonyme, laisser le DN et le mot de passe vides.",
+"User Login Filter" => "Filtre d'identifiants utilisateur",
+"User List Filter" => "Filtre d'utilisateurs",
+"Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
+"without any placeholder, e.g. \"objectClass=person\"." => "sans élément de substitution, par exemple \"objectClass=person\".",
+"Group Filter" => "Filtre de groupes",
+"Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
+"Port" => "Port",
+"Group-Member association" => "Association groupe-membre",
+"Use TLS" => "Utiliser TLS",
+"Do not use it for SSL connections, it will fail." => "Ne pas utiliser pour les connexions SSL, car cela échouera.",
+"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
+"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
+"Not recommended, use for testing only." => "Non recommendé, utilisation pour tests uniquement.",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud",
+"in bytes" => "en octets",
+"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
+"Help" => "Aide"
+);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
new file mode 100644
index 00000000000..70c4bf4d082
--- /dev/null
+++ b/apps/user_ldap/l10n/it.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"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",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+"User DN" => "DN utente",
+"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." => "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",
+"Password" => "Password",
+"For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+"User Login Filter" => "Filtro per il login utente",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\"",
+"User List Filter" => "Filtro per la lista utente",
+"Defines the filter to apply, when retrieving users." => "Specifica quale filtro utilizzare durante il recupero degli utenti.",
+"without any placeholder, e.g. \"objectClass=person\"." => "senza nessun segnaposto, per esempio \"objectClass=person\".",
+"Group Filter" => "Filtro per il gruppo",
+"Defines the filter to apply, when retrieving groups." => "Specifica quale filtro utilizzare durante il recupero dei gruppi.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
+"Port" => "Porta",
+"Base User Tree" => "Struttura base dell'utente",
+"Base Group Tree" => "Struttura base del gruppo",
+"Group-Member association" => "Associazione gruppo-utente ",
+"Use TLS" => "Usa TLS",
+"Do not use it for SSL connections, it will fail." => "Non utilizzare per le connessioni SSL, fallirà.",
+"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
+"Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
+"Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
+"User Display Name Field" => "Campo per la visualizzazione del nome utente",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attributo LDAP da usare per generare il nome dell'utente ownCloud.",
+"Group Display Name Field" => "Campo per la visualizzazione del nome del gruppo",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attributo LDAP da usare per generare il nome del gruppo ownCloud.",
+"in bytes" => "in byte",
+"in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
+"Help" => "Aiuto"
+);
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
new file mode 100644
index 00000000000..8d4473b4e28
--- /dev/null
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "ホスト",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
+"Base DN" => "ベースDN",
+"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザとグループのベースDNを指定することができます。",
+"User DN" => "ユーザDN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
+"Password" => "パスワード",
+"For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
+"User Login Filter" => "ユーザログインフィルタ",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\"",
+"User List Filter" => "ユーザリストフィルタ",
+"Defines the filter to apply, when retrieving users." => "ユーザーを取得するときに適用するフィルターを定義する。",
+"without any placeholder, e.g. \"objectClass=person\"." => "プレースホルダーを利用しないでください。例 \"objectClass=person\"",
+"Group Filter" => "グループフィルタ",
+"Defines the filter to apply, when retrieving groups." => "グループを取得するときに適用するフィルターを定義する。",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\"",
+"Port" => "ポート",
+"Base User Tree" => "ベースユーザツリー",
+"Base Group Tree" => "ベースグループツリー",
+"Group-Member association" => "グループとメンバーの関連付け",
+"Use TLS" => "TLSを利用",
+"Do not use it for SSL connections, it will fail." => "SSL接続に利用しないでください、失敗します。",
+"Case insensitve LDAP server (Windows)" => "大文字/小文字を区別しないLDAPサーバ(Windows)",
+"Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。",
+"Not recommended, use for testing only." => "推奨しません、テスト目的でのみ利用してください。",
+"User Display Name Field" => "ユーザ表示名のフィールド",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "ユーザのownCloud名の生成に利用するLDAP属性。",
+"Group Display Name Field" => "グループ表示名のフィールド",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "グループのownCloud名の生成に利用するLDAP属性。",
+"in bytes" => "バイト",
+"in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
+"Help" => "ヘルプ"
+);
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
new file mode 100644
index 00000000000..326e47f96fe
--- /dev/null
+++ b/apps/user_ldap/l10n/ro.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"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ă",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
+"User DN" => "DN al utilizatorului",
+"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-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.",
+"Password" => "Parolă",
+"For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
+"User Login Filter" => "Filtrare după Nume Utilizator",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "folosiți substituentul %%uid , d.e. \"uid=%%uid\"",
+"User List Filter" => "Filtrarea după lista utilizatorilor",
+"Defines the filter to apply, when retrieving users." => "Definește filtrele care trebui aplicate, când se peiau utilzatorii.",
+"without any placeholder, e.g. \"objectClass=person\"." => "fără substituenți, d.e. \"objectClass=person\".",
+"Group Filter" => "Fitrare Grup",
+"Defines the filter to apply, when retrieving groups." => "Definește filtrele care se aplică, când se preiau grupurile.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "fără substituenți, d.e. \"objectClass=posixGroup\"",
+"Port" => "Portul",
+"Base User Tree" => "Arborele de bază al Utilizatorilor",
+"Base Group Tree" => "Arborele de bază al Grupurilor",
+"Group-Member association" => "Asocierea Grup-Membru",
+"Use TLS" => "Utilizează TLS",
+"Do not use it for SSL connections, it will fail." => "A nu se utiliza pentru conexiuni SSL, va eșua.",
+"Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
+"Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud.",
+"Not recommended, use for testing only." => "Nu este recomandat, a se utiliza doar pentru testare.",
+"User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud.",
+"Group Display Name Field" => "Câmpul cu numele grupului",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud",
+"in bytes" => "în octeți",
+"in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
+"Help" => "Ajutor"
+);
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
new file mode 100644
index 00000000000..8126124f1f6
--- /dev/null
+++ b/apps/user_ldap/l10n/sl.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Gostitelj",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol lahko izpustite, razen če zahtevate SSL. V tem primeru začnite z ldaps://",
+"Base DN" => "Osnovni DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno",
+"User DN" => "Uporabnik DN",
+"Password" => "Geslo",
+"For anonymous access, leave DN and Password empty." => "Za anonimni dostop pustite polji za DN in geslo prazni.",
+"User Login Filter" => "Filter prijav uporabnikov",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uporabite ogrado %%uid, npr. \"uid=%%uid\"",
+"User List Filter" => "Filter seznama uporabnikov",
+"Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.",
+"without any placeholder, e.g. \"objectClass=person\"." => "Brez katerekoli ograde, npr. \"objectClass=person\".",
+"Group Filter" => "Filter skupin",
+"Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.",
+"Port" => "Vrata",
+"Use TLS" => "Uporabi TLS",
+"Do not use it for SSL connections, it will fail." => "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo.",
+"Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti SSL certifikata.",
+"Not recommended, use for testing only." => "Odsvetovano, uporabite le v namene preizkušanja.",
+"in bytes" => "v bajtih",
+"Help" => "Pomoč"
+);
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
new file mode 100644
index 00000000000..aa2d35ed853
--- /dev/null
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -0,0 +1,35 @@
+<?php $TRANSLATIONS = array(
+"Host" => "โฮสต์",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
+"Base DN" => "DN ฐาน",
+"You can specify Base DN for users and groups in the Advanced tab" => "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้",
+"User DN" => "DN ของผู้ใช้งาน",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้",
+"Password" => "รหัสผ่าน",
+"For anonymous access, leave DN and Password empty." => "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
+"User Login Filter" => "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\"",
+"User List Filter" => "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน",
+"Defines the filter to apply, when retrieving users." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน",
+"without any placeholder, e.g. \"objectClass=person\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\",",
+"Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
+"Defines the filter to apply, when retrieving groups." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\",",
+"Port" => "พอร์ต",
+"Base User Tree" => "รายการผู้ใช้งานหลักแบบ Tree",
+"Base Group Tree" => "รายการกลุ่มหลักแบบ Tree",
+"Group-Member association" => "ความสัมพันธ์ของสมาชิกในกลุ่ม",
+"Use TLS" => "ใช้ TLS",
+"Do not use it for SSL connections, it will fail." => "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว",
+"Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud",
+"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" => "ช่องแสดงชื่อกลุ่มที่ต้องการ",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud",
+"in bytes" => "ในหน่วยไบต์",
+"in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
+"Help" => "ช่วยเหลือ"
+);
diff --git a/apps/user_migrate/l10n/ca.php b/apps/user_migrate/l10n/ca.php
index 6f1c77e4173..6e423c01b0b 100644
--- a/apps/user_migrate/l10n/ca.php
+++ b/apps/user_migrate/l10n/ca.php
@@ -2,9 +2,9 @@
"Export" => "Exporta",
"Something went wrong while the export file was being generated" => "Alguna cosa ha anat malament en generar el fitxer d'exportació",
"An error has occurred" => "S'ha produït un error",
-"Export your user account" => "Exporta el vostre compte d'usuari",
+"Export your user account" => "Exportar el compte d'usuari",
"This will create a compressed file that contains your ownCloud account." => "Això crearà un fitxer comprimit que conté el vostre compte ownCloud.",
-"Import user account" => "Importa el compte d'usuari",
+"Import user account" => "Importar el compte d'usuari",
"ownCloud User Zip" => "zip d'usuari ownCloud",
"Import" => "Importa"
);
diff --git a/apps/user_migrate/l10n/cs_CZ.php b/apps/user_migrate/l10n/cs_CZ.php
new file mode 100644
index 00000000000..81a5a45d978
--- /dev/null
+++ b/apps/user_migrate/l10n/cs_CZ.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Export",
+"Something went wrong while the export file was being generated" => "Během vytváření souboru exportu došlo k chybě",
+"An error has occurred" => "Nastala chyba",
+"Export your user account" => "Export Vašeho uživatelského účtu",
+"This will create a compressed file that contains your ownCloud account." => "Bude vytvořen komprimovaný soubor, obsahující Váš ownCloud účet.",
+"Import user account" => "Import uživatelského účtu",
+"ownCloud User Zip" => "Zip soubor uživatele ownCloud",
+"Import" => "Import"
+);
diff --git a/apps/user_migrate/l10n/de.php b/apps/user_migrate/l10n/de.php
new file mode 100644
index 00000000000..110b0bba6e6
--- /dev/null
+++ b/apps/user_migrate/l10n/de.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Export",
+"Something went wrong while the export file was being generated" => "Beim Export der Datei ist etwas schief gegangen.",
+"An error has occurred" => "Es ist ein Fehler aufgetreten.",
+"Export your user account" => "Ihr Konto exportieren",
+"This will create a compressed file that contains your ownCloud account." => "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält.",
+"Import user account" => "Konto importieren",
+"ownCloud User Zip" => "Zip-Archiv mit Benutzerdaten",
+"Import" => "Importieren"
+);
diff --git a/apps/user_migrate/l10n/eo.php b/apps/user_migrate/l10n/eo.php
new file mode 100644
index 00000000000..ca918061691
--- /dev/null
+++ b/apps/user_migrate/l10n/eo.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Malenporti",
+"Something went wrong while the export file was being generated" => "Io malsukcesis dum la enportota dosiero generiĝis",
+"An error has occurred" => "Eraro okazis",
+"Export your user account" => "Malenporti vian uzantokonton",
+"This will create a compressed file that contains your ownCloud account." => "Ĉi tio kreos densigitan dosieron, kiu enhavas vian konton de ownCloud.",
+"Import user account" => "Enporti uzantokonton",
+"ownCloud User Zip" => "ZIP-dosiero de uzanto de ownCloud",
+"Import" => "Enporti"
+);
diff --git a/apps/user_migrate/l10n/fi_FI.php b/apps/user_migrate/l10n/fi_FI.php
new file mode 100644
index 00000000000..2616bee6f2a
--- /dev/null
+++ b/apps/user_migrate/l10n/fi_FI.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Vie",
+"Something went wrong while the export file was being generated" => "Jokin meni pieleen vientiä suorittaessa",
+"An error has occurred" => "Tapahtui virhe",
+"Export your user account" => "Vie käyttäjätilisi",
+"This will create a compressed file that contains your ownCloud account." => "Tämä luo ownCloud-käyttäjätilisi sisältävän pakatun tiedoston.",
+"Import user account" => "Tuo käyttäjätili",
+"Import" => "Tuo"
+);
diff --git a/apps/user_migrate/l10n/fr.php b/apps/user_migrate/l10n/fr.php
new file mode 100644
index 00000000000..f1fe46bcacb
--- /dev/null
+++ b/apps/user_migrate/l10n/fr.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Exporter",
+"Something went wrong while the export file was being generated" => "Une erreur s'est produit pendant la génération du fichier d'export",
+"An error has occurred" => "Une erreur s'est produite",
+"Export your user account" => "Exportez votre compte utilisateur",
+"This will create a compressed file that contains your ownCloud account." => "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud.",
+"Import user account" => "Importer un compte utilisateur",
+"ownCloud User Zip" => "Archive Zip de l'utilisateur",
+"Import" => "Importer"
+);
diff --git a/apps/user_migrate/l10n/it.php b/apps/user_migrate/l10n/it.php
new file mode 100644
index 00000000000..f3eeb15dab5
--- /dev/null
+++ b/apps/user_migrate/l10n/it.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Esporta",
+"Something went wrong while the export file was being generated" => "Si è verificato un errore durante la creazione del file di esportazione",
+"An error has occurred" => "Si è verificato un errore",
+"Export your user account" => "Esporta il tuo account utente",
+"This will create a compressed file that contains your ownCloud account." => "Questa operazione creerà un file compresso che contiene il tuo account ownCloud.",
+"Import user account" => "Importa account utente",
+"ownCloud User Zip" => "Zip account utente",
+"Import" => "Importa"
+);
diff --git a/apps/user_migrate/l10n/ja_JP.php b/apps/user_migrate/l10n/ja_JP.php
new file mode 100644
index 00000000000..86c66e6319c
--- /dev/null
+++ b/apps/user_migrate/l10n/ja_JP.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "エクスポート",
+"Something went wrong while the export file was being generated" => "エクスポートファイルの生成時に何か不具合が発生しました。",
+"An error has occurred" => "エラーが発生しました",
+"Export your user account" => "ユーザアカウントのエクスポート",
+"This will create a compressed file that contains your ownCloud account." => "あなたのownCloudアカウントを含む圧縮ファイルを生成します。",
+"Import user account" => "ユーザアカウントをインポート",
+"ownCloud User Zip" => "ownCloudユーザZip",
+"Import" => "インポート"
+);
diff --git a/apps/user_migrate/l10n/sl.php b/apps/user_migrate/l10n/sl.php
new file mode 100644
index 00000000000..c14bca0f709
--- /dev/null
+++ b/apps/user_migrate/l10n/sl.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "Izvozi",
+"Something went wrong while the export file was being generated" => "Med ustvarjanjem datoteke za izvoz je prišlo do napake",
+"An error has occurred" => "Prišlo je do napake",
+"Export your user account" => "Izvozi vaš uporabniški račun",
+"This will create a compressed file that contains your ownCloud account." => "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom.",
+"Import user account" => "Uvozi uporabniški račun",
+"ownCloud User Zip" => "Zip datoteka ownCloud uporabnika",
+"Import" => "Uvozi"
+);
diff --git a/apps/user_migrate/l10n/th_TH.php b/apps/user_migrate/l10n/th_TH.php
new file mode 100644
index 00000000000..d2c36bb4edd
--- /dev/null
+++ b/apps/user_migrate/l10n/th_TH.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Export" => "ส่งออก",
+"Something went wrong while the export file was being generated" => "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์",
+"An error has occurred" => "เกิดข้อผิดพลาดบางประการ",
+"Export your user account" => "ส่งออกบัญชีผู้ใช้งานของคุณ",
+"This will create a compressed file that contains your ownCloud account." => "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ",
+"Import user account" => "นำเข้าบัญชีผู้ใช้งาน",
+"ownCloud User Zip" => "ไฟล์ Zip ผู้ใช้งาน ownCloud",
+"Import" => "นำเข้า"
+);
diff --git a/apps/user_openid/l10n/cs_CZ.php b/apps/user_openid/l10n/cs_CZ.php
new file mode 100644
index 00000000000..9c041a89a68
--- /dev/null
+++ b/apps/user_openid/l10n/cs_CZ.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Toto je OpenID server endpoint. Více informací na",
+"Identity: <b>" => "Identita: <b>",
+"Realm: <b>" => "Oblast: <b>",
+"User: <b>" => "Uživatel: <b>",
+"Login" => "Login",
+"Error: <b>No user Selected" => "Chyba: <b>Uživatel není zvolen",
+"you can authenticate to other sites with this address" => "s touto adresou se můžete autrorizovat na další strany",
+"Authorized OpenID provider" => "Autorizovaný OpenID poskytovatel",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Vaše adresa na Wordpressu, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/de.php b/apps/user_openid/l10n/de.php
new file mode 100644
index 00000000000..97abccba9e4
--- /dev/null
+++ b/apps/user_openid/l10n/de.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:",
+"Identity: <b>" => "Identität: <b>",
+"Realm: <b>" => "Bereich: <b>",
+"User: <b>" => "Benutzer: <b>",
+"Login" => "Anmelden",
+"Error: <b>No user Selected" => "Fehler: <b> Kein Benutzer gewählt",
+"you can authenticate to other sites with this address" => "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren.",
+"Authorized OpenID provider" => "Authorisierter OpenID-Anbieter",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/eo.php b/apps/user_openid/l10n/eo.php
new file mode 100644
index 00000000000..665d1990949
--- /dev/null
+++ b/apps/user_openid/l10n/eo.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Ĉi tio estas finpunkto de OpenID-servilo. Por pli da informo, vidu",
+"Identity: <b>" => "Idento: <b>",
+"Realm: <b>" => "Regno: <b>",
+"User: <b>" => "Uzanto: <b>",
+"Login" => "Ensaluti",
+"Error: <b>No user Selected" => "Eraro: <b>neniu uzanto estas elektita",
+"you can authenticate to other sites with this address" => "Vi povas ensaluti en aliaj ejoj per tiu ĉi adreso",
+"Authorized OpenID provider" => "Rajtigita OpenID-provizanto",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Via adreso ĉe Wordpress, Identi.ca&hellip;"
+);
diff --git a/apps/user_openid/l10n/et_EE.php b/apps/user_openid/l10n/et_EE.php
new file mode 100644
index 00000000000..f04bcafb249
--- /dev/null
+++ b/apps/user_openid/l10n/et_EE.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "See on OpenID serveri lõpp-punkt. Lisainfot vaata",
+"Identity: <b>" => "Identiteet: <b>",
+"Realm: <b>" => "Tsoon: <b>"
+);
diff --git a/apps/user_openid/l10n/fr.php b/apps/user_openid/l10n/fr.php
new file mode 100644
index 00000000000..ec3d00853d9
--- /dev/null
+++ b/apps/user_openid/l10n/fr.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter",
+"Identity: <b>" => "Identité : <b>",
+"Realm: <b>" => "Domaine : <b>",
+"User: <b>" => "Utilisateur : <b>",
+"Login" => "Connexion",
+"Error: <b>No user Selected" => "Erreur : <b>Aucun nom d'utilisateur n'a été saisi",
+"you can authenticate to other sites with this address" => "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse",
+"Authorized OpenID provider" => "Fournisseur d'identité OpenID autorisé",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Votre adresse Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/it.php b/apps/user_openid/l10n/it.php
new file mode 100644
index 00000000000..bda06ce18a9
--- /dev/null
+++ b/apps/user_openid/l10n/it.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Questo è un server OpenID. Per ulteriori informazioni, vedi",
+"Identity: <b>" => "Identità: <b>",
+"Realm: <b>" => "Dominio: <b>",
+"User: <b>" => "Utente: <b>",
+"Login" => "Accesso",
+"Error: <b>No user Selected" => "Errore: <b>nessun utente selezionato",
+"you can authenticate to other sites with this address" => "puoi autenticarti ad altri siti con questo indirizzo",
+"Authorized OpenID provider" => "Fornitore OpenID autorizzato",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/ja_JP.php b/apps/user_openid/l10n/ja_JP.php
new file mode 100644
index 00000000000..12a2692cb67
--- /dev/null
+++ b/apps/user_openid/l10n/ja_JP.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "これはOpenIDサーバのエンドポイントです。詳細は下記をチェックしてください。",
+"Identity: <b>" => "識別子: <b>",
+"Realm: <b>" => "レルム: <b>",
+"User: <b>" => "ユーザ: <b>",
+"Login" => "ログイン",
+"Error: <b>No user Selected" => "エラー: <b>ユーザが選択されていません",
+"you can authenticate to other sites with this address" => "他のサイトにこのアドレスで認証することができます",
+"Authorized OpenID provider" => "認証されたOpenIDプロバイダ",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Wordpressのアドレス、Identi.ca、&hellip;"
+);
diff --git a/apps/user_openid/l10n/sl.php b/apps/user_openid/l10n/sl.php
new file mode 100644
index 00000000000..0464214a427
--- /dev/null
+++ b/apps/user_openid/l10n/sl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "To je OpenID strežniška končna točka. Za več informacij si oglejte",
+"Identity: <b>" => "Identiteta: <b>",
+"Realm: <b>" => "Področje: <b>",
+"User: <b>" => "Uporabnik:",
+"Login" => "Prijava",
+"Error: <b>No user Selected" => "Napaka: <b>Uporabnik ni bil izbran",
+"you can authenticate to other sites with this address" => "s tem naslovom se lahko overite tudi na drugih straneh",
+"Authorized OpenID provider" => "Odobren ponudnik OpenID",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/th_TH.php b/apps/user_openid/l10n/th_TH.php
new file mode 100644
index 00000000000..fbf0bbc60a5
--- /dev/null
+++ b/apps/user_openid/l10n/th_TH.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่",
+"Identity: <b>" => "ข้อมูลประจำตัว <b>",
+"Realm: <b>" => "ขอบเขตพื้นที่ <b>",
+"User: <b>" => "ผู้ใช้งาน: <b>",
+"Login" => "เข้าสู่ระบบ",
+"Error: <b>No user Selected" => "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน",
+"you can authenticate to other sites with this address" => "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้",
+"Authorized OpenID provider" => "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต",
+"Your address at Wordpress, Identi.ca, &hellip;" => "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index f06346672ff..b725937948a 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -7,17 +7,17 @@ header("Access-Control-Allow-Origin: *");
header("Content-Type: application/xrd+json");
/**
- * To include your app in the webfinger XML, add a new script with file name
+ * To include your app in the webfinger JSON, add a new script with file name
* 'webfinger.php' to /apps/yourapp/appinfo/, which prints out the XML parts
* to be included. That script can make use of the constants WF_USER (e. g.
* "user"), WF_ID (user@host) and WF_BASEURL (e. g. https://host/owncloud).
* An example could look like this:
*
- * <Link
- * rel="myProfile"
- * type="text/html"
- * href="<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
- * </Link>
+ * {
+ * "rel":"myProfile",
+ * "type":"text/html",
+ * "href":"<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>"
+ * }
*
* but can also use complex database queries to generate the webfinger result
**/
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index db1b1970f17..25d472b2dc4 100644
--- a/core/img/actions/add.png
+++ b/core/img/actions/add.png
Binary files differ
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index bc0c782882d..fa8e18183ed 100644
--- a/core/img/actions/delete.png
+++ b/core/img/actions/delete.png
Binary files differ
diff --git a/core/img/actions/download.png b/core/img/actions/download.png
index 14e88e14c0f..65954f941bb 100644
--- a/core/img/actions/download.png
+++ b/core/img/actions/download.png
Binary files differ
diff --git a/core/img/actions/history.png b/core/img/actions/history.png
index b1e743651f8..1d138b8cd5a 100644
--- a/core/img/actions/history.png
+++ b/core/img/actions/history.png
Binary files differ
diff --git a/core/img/actions/info.png b/core/img/actions/info.png
index 2257d144d11..37ccb356830 100644
--- a/core/img/actions/info.png
+++ b/core/img/actions/info.png
Binary files differ
diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index 74dcd33bee7..eb2ea766c31 100644
--- a/core/img/actions/logout.png
+++ b/core/img/actions/logout.png
Binary files differ
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
index 4d3192ef329..8e884fbc0ea 100644
--- a/core/img/actions/mail.png
+++ b/core/img/actions/mail.png
Binary files differ
diff --git a/core/img/actions/pause-big.png b/core/img/actions/pause-big.png
index 9bcfd0406d8..1c4cf503b8d 100644
--- a/core/img/actions/pause-big.png
+++ b/core/img/actions/pause-big.png
Binary files differ
diff --git a/core/img/actions/pause.png b/core/img/actions/pause.png
index ced8c43ab34..f74ed3a8619 100644
--- a/core/img/actions/pause.png
+++ b/core/img/actions/pause.png
Binary files differ
diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png
index 0c330d4ac44..0097f671aef 100644
--- a/core/img/actions/play-add.png
+++ b/core/img/actions/play-add.png
Binary files differ
diff --git a/core/img/actions/play-big.png b/core/img/actions/play-big.png
index 3ccd36129ec..2da2426dcfc 100644
--- a/core/img/actions/play-big.png
+++ b/core/img/actions/play-big.png
Binary files differ
diff --git a/core/img/actions/play-next.png b/core/img/actions/play-next.png
index 0c0ccc87cdc..08568b3dc0b 100644
--- a/core/img/actions/play-next.png
+++ b/core/img/actions/play-next.png
Binary files differ
diff --git a/core/img/actions/play-previous.png b/core/img/actions/play-previous.png
index d98cedaa1e8..811cde46c15 100644
--- a/core/img/actions/play-previous.png
+++ b/core/img/actions/play-previous.png
Binary files differ
diff --git a/core/img/actions/play.png b/core/img/actions/play.png
index a252a751554..adbef1e576d 100644
--- a/core/img/actions/play.png
+++ b/core/img/actions/play.png
Binary files differ
diff --git a/core/img/actions/public.png b/core/img/actions/public.png
index 75d1366326b..9e56f2919fd 100644
--- a/core/img/actions/public.png
+++ b/core/img/actions/public.png
Binary files differ
diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png
index 9993a092df1..3af6840071b 100644
--- a/core/img/actions/rename.png
+++ b/core/img/actions/rename.png
Binary files differ
diff --git a/core/img/actions/search.png b/core/img/actions/search.png
index bfedb80bb57..98e1d73ee34 100644
--- a/core/img/actions/search.png
+++ b/core/img/actions/search.png
Binary files differ
diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
index 5b1607e59fc..8b3acb00a4f 100644
--- a/core/img/actions/settings.png
+++ b/core/img/actions/settings.png
Binary files differ
diff --git a/core/img/actions/share.png b/core/img/actions/share.png
index 62c4627f317..099e4d6ab35 100644
--- a/core/img/actions/share.png
+++ b/core/img/actions/share.png
Binary files differ
diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png
index 073ff741685..6e112e75b44 100644
--- a/core/img/actions/shared.png
+++ b/core/img/actions/shared.png
Binary files differ
diff --git a/core/img/actions/sound-off.png b/core/img/actions/sound-off.png
index 7900e500c90..2eddb00af0f 100644
--- a/core/img/actions/sound-off.png
+++ b/core/img/actions/sound-off.png
Binary files differ
diff --git a/core/img/actions/sound.png b/core/img/actions/sound.png
index 838c9cee171..9349c94e7a4 100644
--- a/core/img/actions/sound.png
+++ b/core/img/actions/sound.png
Binary files differ
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index d77d5db2caa..53590a2197b 100644
--- a/core/img/actions/triangle-s.png
+++ b/core/img/actions/triangle-s.png
Binary files differ
diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png
index 09dba9e9108..fd9bdccc240 100644
--- a/core/img/actions/upload-white.png
+++ b/core/img/actions/upload-white.png
Binary files differ
diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png
index 5744aad75a8..1d90165a552 100644
--- a/core/img/actions/upload.png
+++ b/core/img/actions/upload.png
Binary files differ
diff --git a/core/img/breadcrumb-start.png b/core/img/breadcrumb-start.png
index a79d675454e..b0df5f44037 100644
--- a/core/img/breadcrumb-start.png
+++ b/core/img/breadcrumb-start.png
Binary files differ
diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png
index b124f349f56..84992be0d93 100644
--- a/core/img/breadcrumb.png
+++ b/core/img/breadcrumb.png
Binary files differ
diff --git a/core/img/favicon-touch.png b/core/img/favicon-touch.png
index cfaaa4399ac..24770fb634f 100644
--- a/core/img/favicon-touch.png
+++ b/core/img/favicon-touch.png
Binary files differ
diff --git a/core/img/favicon.png b/core/img/favicon.png
index c1b1cb65460..79b6795f6f6 100644
--- a/core/img/favicon.png
+++ b/core/img/favicon.png
Binary files differ
diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
index 6f7bb520f25..e8b230c59cb 100644
--- a/core/img/filetypes/application-msword.png
+++ b/core/img/filetypes/application-msword.png
Binary files differ
diff --git a/core/img/filetypes/application-sgf.png b/core/img/filetypes/application-sgf.png
index f171f5579e7..48996c54394 100644
--- a/core/img/filetypes/application-sgf.png
+++ b/core/img/filetypes/application-sgf.png
Binary files differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
index 4cefbb690d1..e0cf49542d4 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
Binary files differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
index 3d66cc97eb5..b326a0543a5 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
Binary files differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
index 46942cba285..7c6fd246840 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
Binary files differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
index abc38d4310c..8b0e85b0670 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
Binary files differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.text.png b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
index 06c1f30c8fa..48452eb3e86 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.text.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
Binary files differ
diff --git a/core/img/filetypes/application-x-7z-compressed.png b/core/img/filetypes/application-x-7z-compressed.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-7z-compressed.png
+++ b/core/img/filetypes/application-x-7z-compressed.png
Binary files differ
diff --git a/core/img/filetypes/application-x-bzip-compressed-tar.png b/core/img/filetypes/application-x-bzip-compressed-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-bzip-compressed-tar.png
+++ b/core/img/filetypes/application-x-bzip-compressed-tar.png
Binary files differ
diff --git a/core/img/filetypes/application-x-bzip.png b/core/img/filetypes/application-x-bzip.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-bzip.png
+++ b/core/img/filetypes/application-x-bzip.png
Binary files differ
diff --git a/core/img/filetypes/application-x-compressed-tar.png b/core/img/filetypes/application-x-compressed-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-compressed-tar.png
+++ b/core/img/filetypes/application-x-compressed-tar.png
Binary files differ
diff --git a/core/img/filetypes/application-x-deb.png b/core/img/filetypes/application-x-deb.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-deb.png
+++ b/core/img/filetypes/application-x-deb.png
Binary files differ
diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
index eff1b7fc8c2..b3f6b7e5cf9 100644
--- a/core/img/filetypes/application-x-debian-package.png
+++ b/core/img/filetypes/application-x-debian-package.png
Binary files differ
diff --git a/core/img/filetypes/application-x-gzip.png b/core/img/filetypes/application-x-gzip.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-gzip.png
+++ b/core/img/filetypes/application-x-gzip.png
Binary files differ
diff --git a/core/img/filetypes/application-x-lzma-compressed-tar.png b/core/img/filetypes/application-x-lzma-compressed-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-lzma-compressed-tar.png
+++ b/core/img/filetypes/application-x-lzma-compressed-tar.png
Binary files differ
diff --git a/core/img/filetypes/application-x-rar.png b/core/img/filetypes/application-x-rar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-rar.png
+++ b/core/img/filetypes/application-x-rar.png
Binary files differ
diff --git a/core/img/filetypes/application-x-rpm.png b/core/img/filetypes/application-x-rpm.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-rpm.png
+++ b/core/img/filetypes/application-x-rpm.png
Binary files differ
diff --git a/core/img/filetypes/application-x-tar.png b/core/img/filetypes/application-x-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-tar.png
+++ b/core/img/filetypes/application-x-tar.png
Binary files differ
diff --git a/core/img/filetypes/application-x-tarz.png b/core/img/filetypes/application-x-tarz.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-tarz.png
+++ b/core/img/filetypes/application-x-tarz.png
Binary files differ
diff --git a/core/img/filetypes/application-zip.png b/core/img/filetypes/application-zip.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-zip.png
+++ b/core/img/filetypes/application-zip.png
Binary files differ
diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png
index 5769120b1b6..9f5db634a4f 100644
--- a/core/img/filetypes/flash.png
+++ b/core/img/filetypes/flash.png
Binary files differ
diff --git a/core/img/icon-error.png b/core/img/icon-error.png
index ed438a32fd8..1ce0be0fb2e 100644
--- a/core/img/icon-error.png
+++ b/core/img/icon-error.png
Binary files differ
diff --git a/core/img/icon-sync.png b/core/img/icon-sync.png
index 99a43d4c69a..a3d09704246 100644
--- a/core/img/icon-sync.png
+++ b/core/img/icon-sync.png
Binary files differ
diff --git a/core/img/icon.png b/core/img/icon.png
index 24a4b1c3e83..745b82584c6 100644
--- a/core/img/icon.png
+++ b/core/img/icon.png
Binary files differ
diff --git a/core/img/logo-inverted.png b/core/img/logo-inverted.png
index d9fd119dc18..265a8871b45 100644
--- a/core/img/logo-inverted.png
+++ b/core/img/logo-inverted.png
Binary files differ
diff --git a/core/img/logo-square.png b/core/img/logo-square.png
index 086d415db6d..b836de8f3be 100644
--- a/core/img/logo-square.png
+++ b/core/img/logo-square.png
Binary files differ
diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png
index ea10828db5e..702f1d97e5b 100644
--- a/core/img/logo-wide.png
+++ b/core/img/logo-wide.png
Binary files differ
diff --git a/core/img/logo.png b/core/img/logo.png
index 8177c4cdba1..a84fe145bbd 100644
--- a/core/img/logo.png
+++ b/core/img/logo.png
Binary files differ
diff --git a/core/img/places/file.png b/core/img/places/file.png
index 49790448897..63837a1af90 100644
--- a/core/img/places/file.png
+++ b/core/img/places/file.png
Binary files differ
diff --git a/core/img/places/folder.png b/core/img/places/folder.png
index 3edbe257a34..46079e03e9e 100644
--- a/core/img/places/folder.png
+++ b/core/img/places/folder.png
Binary files differ
diff --git a/core/img/places/home.png b/core/img/places/home.png
index b3fb9bbaf6f..c3dbd3e3538 100644
--- a/core/img/places/home.png
+++ b/core/img/places/home.png
Binary files differ
diff --git a/core/img/places/music.png b/core/img/places/music.png
index 4c844425d64..85ee2474cd1 100644
--- a/core/img/places/music.png
+++ b/core/img/places/music.png
Binary files differ
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index 980a7c69813..9abcd09722c 100644
--- a/core/img/places/picture.png
+++ b/core/img/places/picture.png
Binary files differ
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
index 7c429a6a738..f2254233031 100644
--- a/core/img/remoteStorage-big.png
+++ b/core/img/remoteStorage-big.png
Binary files differ
diff --git a/core/js/js.js b/core/js/js.js
index 92a2660fd9c..499e6b7525c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -475,8 +475,9 @@ $(document).ready(function(){
}
}
// hide log in button etc. when form fields not filled
- checkShowCredentials();
- $('input#user, input#password').keyup(checkShowCredentials);
+ // commented out due to some browsers having issues with it
+ // checkShowCredentials();
+ // $('input#user, input#password').keyup(checkShowCredentials);
$('#settings #expand').keydown(function(event) {
if (event.which == 13 || event.which == 32) {
diff --git a/core/js/share.js b/core/js/share.js
index 38c20a75709..bd145eab41c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -270,7 +270,7 @@ $(document).ready(function() {
FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
// Return the correct sharing icon
if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
- var item = $('#dir').val() + '/' + filename;
+ var item = $('#dir').val() + filename;
// Check if status is in cache
if (OC.Share.statuses[item] === true) {
return OC.imagePath('core', 'actions/public');
@@ -292,7 +292,7 @@ $(document).ready(function() {
return OC.imagePath('core', 'actions/share');
}
}, function(filename) {
- var item = $('#dir').val() + '/' + filename;
+ var item = $('#dir').val() + filename;
if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
var itemType = 'folder';
var possiblePermissions = OC.Share.PERMISSION_CREATE | OC.Share.PERMISSION_UPDATE | OC.Share.PERMISSION_DELETE | OC.Share.PERMISSION_SHARE;
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 052edbcaa4e..25b3d8aadcf 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 6074b2d6701..1d213427bcb 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 2b79ab09cce..b026dc02301 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index abf56cce11c..0f13d4ebb2a 100644
--- a/l10n/ar/settings.po
+++ b/l10n/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index b9c9e90a503..93e98852841 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index a6637ba21a0..803e9d5953d 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index c76da91d867..5cfc246c8af 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index cfa402cb998..e7697bb27ee 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 4db2c47811c..1eeeca36028 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 11:14+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 07:15+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"
@@ -241,8 +241,8 @@ msgstr "No s'ha pogut obtenir una adreça vàlida."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Error"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "Voleu fusionar aquestes llibretes d'adreces?"
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat: "
@@ -811,11 +815,11 @@ msgstr "Configura les llibretes d'adreces"
msgid "Select Address Books"
msgstr "Selecccioneu llibretes d'adreces"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Escriviu un nom"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Escriviu una descripció"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 5fce708ceb7..a2e064f801d 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,15 +77,15 @@ msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "executa una tasca en carregar cada pàgina"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php està registrat en un servei web cron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "usa el servei cron del sistema"
#: templates/admin.php:39
msgid "Log"
@@ -97,7 +97,7 @@ msgstr "Més"
#: templates/apps.php:10
msgid "Add your App"
-msgstr "Afegeiu la vostra aplicació"
+msgstr "Afegiu la vostra aplicació"
#: templates/apps.php:26
msgid "Select an App"
@@ -228,8 +228,8 @@ msgid "Other"
msgstr "Altre"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/ca/user_migrate.po b/l10n/ca/user_migrate.po
index 3732c55e9f2..c603e775e46 100644
--- a/l10n/ca/user_migrate.po
+++ b/l10n/ca/user_migrate.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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 18:39+0000\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:04+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"
@@ -32,7 +32,7 @@ msgstr "S'ha produït un error"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr "Exporta el vostre compte d'usuari"
+msgstr "Exportar el compte d'usuari"
#: templates/settings.php:3
msgid ""
@@ -41,7 +41,7 @@ msgstr "Això crearà un fitxer comprimit que conté el vostre compte ownCloud."
#: templates/settings.php:13
msgid "Import user account"
-msgstr "Importa el compte d'usuari"
+msgstr "Importar el compte d'usuari"
#: templates/settings.php:15
msgid "ownCloud User Zip"
diff --git a/l10n/cs_CZ/admin_dependencies_chk.po b/l10n/cs_CZ/admin_dependencies_chk.po
index 33a79435b54..82774f6a248 100644
--- a/l10n/cs_CZ/admin_dependencies_chk.po
+++ b/l10n/cs_CZ/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 15:37+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "Modul php-json je třeba pro vzájemnou komunikaci mnoha aplikací"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "Modul php-curl je třeba pro zobrazení titulu strany v okamžiku přidání záložky"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Modul php-gd je třeba pro tvorbu náhledů Vašich obrázků"
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Modul php-ldap je třeba pro připojení na Váš ldap server"
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Modul php-zip je třeba pro souběžné stahování souborů"
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Modul php-mb_multibyte je třeba pro správnou funkci kódování."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Modul php-ctype je třeba k ověřování dat."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Modul php-xml je třeba ke sdílení souborů prostřednictvím WebDAV."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "Příkaz allow_url_fopen ve Vašem php.ini souboru by měl být nastaven na 1 kvůli získávání informací z OCS serverů"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Modul php-pdo je třeba pro ukládání dat ownCloud do databáze"
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Status závislostí"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Používáno:"
diff --git a/l10n/cs_CZ/admin_migrate.po b/l10n/cs_CZ/admin_migrate.po
index c24913e0709..a43f6e5be06 100644
--- a/l10n/cs_CZ/admin_migrate.po
+++ b/l10n/cs_CZ/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:35+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Export této instance ownCloud"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Bude vytvořen komprimovaný soubor obsahující data této instance ownCloud.⏎ Zvolte typ exportu:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Export"
diff --git a/l10n/cs_CZ/bookmarks.po b/l10n/cs_CZ/bookmarks.po
index 74239f80fa7..a6d7d19a244 100644
--- a/l10n/cs_CZ/bookmarks.po
+++ b/l10n/cs_CZ/bookmarks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:44+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +20,42 @@ msgstr ""
#: appinfo/app.php:14
msgid "Bookmarks"
-msgstr ""
+msgstr "Záložky"
#: bookmarksHelper.php:99
msgid "unnamed"
-msgstr ""
+msgstr "nepojmenovaný"
#: templates/bookmarklet.php:5
msgid ""
"Drag this to your browser bookmarks and click it, when you want to bookmark "
"a webpage quickly:"
-msgstr ""
+msgstr "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:"
#: templates/bookmarklet.php:7
msgid "Read later"
-msgstr ""
+msgstr "Přečíst později"
#: templates/list.php:13
msgid "Address"
-msgstr ""
+msgstr "Adresa"
#: templates/list.php:14
msgid "Title"
-msgstr ""
+msgstr "Název"
#: templates/list.php:15
msgid "Tags"
-msgstr ""
+msgstr "Tagy"
#: templates/list.php:16
msgid "Save bookmark"
-msgstr ""
+msgstr "Uložit záložku"
#: templates/list.php:22
msgid "You have no bookmarks"
-msgstr ""
+msgstr "Nemáte žádné záložky"
#: templates/settings.php:11
msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Záložky <br />"
diff --git a/l10n/cs_CZ/calendar.po b/l10n/cs_CZ/calendar.po
index 0d3b9869286..f06317221c0 100644
--- a/l10n/cs_CZ/calendar.po
+++ b/l10n/cs_CZ/calendar.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:41+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
#: ajax/cache/status.php:19
msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "V paměti nejsou uloženy kompletně všechny kalendáře"
#: ajax/cache/status.php:21
msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Zdá se, že vše je kompletně uloženo v paměti"
#: ajax/categories/rescan.php:29
msgid "No calendars found."
@@ -44,19 +44,19 @@ msgstr "Nesprávný kalendář"
msgid ""
"The file contained either no events or all events are already saved in your "
"calendar."
-msgstr ""
+msgstr "Soubor, obsahující všechny záznamy nebo je prázdný, je již uložen ve Vašem kalendáři."
#: ajax/import/dropimport.php:31 ajax/import/import.php:67
msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "Záznam byl uložen v novém kalendáři"
#: ajax/import/import.php:56
msgid "Import failed"
-msgstr ""
+msgstr "Import selhal"
#: ajax/import/import.php:69
msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "záznamů bylo uloženo ve Vašem kalendáři"
#: ajax/settings/guesstimezone.php:25
msgid "New Timezone:"
@@ -161,7 +161,7 @@ msgstr "Pracovní"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "od"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -350,79 +350,79 @@ msgstr "Kal."
#: templates/calendar.php:6
msgid "Sun."
-msgstr ""
+msgstr "Ne"
#: templates/calendar.php:6
msgid "Mon."
-msgstr ""
+msgstr "Po"
#: templates/calendar.php:6
msgid "Tue."
-msgstr ""
+msgstr "Út"
#: templates/calendar.php:6
msgid "Wed."
-msgstr ""
+msgstr "St"
#: templates/calendar.php:6
msgid "Thu."
-msgstr ""
+msgstr "Čt"
#: templates/calendar.php:6
msgid "Fri."
-msgstr ""
+msgstr "Pá"
#: templates/calendar.php:6
msgid "Sat."
-msgstr ""
+msgstr "So"
#: templates/calendar.php:8
msgid "Jan."
-msgstr ""
+msgstr "Ne"
#: templates/calendar.php:8
msgid "Feb."
-msgstr ""
+msgstr "únor"
#: templates/calendar.php:8
msgid "Mar."
-msgstr ""
+msgstr "březen"
#: templates/calendar.php:8
msgid "Apr."
-msgstr ""
+msgstr "duben"
#: templates/calendar.php:8
msgid "May."
-msgstr ""
+msgstr "květen"
#: templates/calendar.php:8
msgid "Jun."
-msgstr ""
+msgstr "červen"
#: templates/calendar.php:8
msgid "Jul."
-msgstr ""
+msgstr "červenec"
#: templates/calendar.php:8
msgid "Aug."
-msgstr ""
+msgstr "srpen"
#: templates/calendar.php:8
msgid "Sep."
-msgstr ""
+msgstr "září"
#: templates/calendar.php:8
msgid "Oct."
-msgstr ""
+msgstr "říjen"
#: templates/calendar.php:8
msgid "Nov."
-msgstr ""
+msgstr "listopad"
#: templates/calendar.php:8
msgid "Dec."
-msgstr ""
+msgstr "prosinec"
#: templates/calendar.php:11
msgid "All day"
@@ -479,7 +479,7 @@ msgstr "dnes"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -687,7 +687,7 @@ msgstr "Importovat soubor kalendáře"
#: templates/part.import.php:24
msgid "Please choose a calendar"
-msgstr ""
+msgstr "Vyberte prosím kalendář"
#: templates/part.import.php:36
msgid "Name of new calendar"
@@ -695,13 +695,13 @@ msgstr "Název nového kalendáře"
#: templates/part.import.php:44
msgid "Take an available name!"
-msgstr ""
+msgstr "Použijte volné jméno!"
#: templates/part.import.php:45
msgid ""
"A Calendar with this name already exists. If you continue anyhow, these "
"calendars will be merged."
-msgstr ""
+msgstr "Kalendář s trímto názvem již existuje. Pokud název použijete, stejnojmenné kalendáře budou sloučeny."
#: templates/part.import.php:47
msgid "Import"
@@ -733,7 +733,7 @@ msgstr "v"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "Hlavní"
#: templates/settings.php:15
msgid "Timezone"
@@ -741,11 +741,11 @@ msgstr "Časové pásmo"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "Obnovit auronaricky časovou zónu."
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "Formát času"
#: templates/settings.php:57
msgid "24h"
@@ -757,39 +757,39 @@ msgstr "12h"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "Týden začína v"
#: templates/settings.php:76
msgid "Cache"
-msgstr ""
+msgstr "Paměť"
#: templates/settings.php:80
msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Vymazat paměť pro opakuijísí se záznamy"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Kalendář CalDAV synchronizuje adresy"
#: templates/settings.php:87
msgid "more info"
-msgstr ""
+msgstr "podrobnosti"
#: templates/settings.php:89
msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primární adresa (veřejná)"
#: templates/settings.php:91
msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
#: templates/settings.php:93
msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Odkaz(y) kalendáře pouze pro čtení"
#: templates/share.dropdown.php:20
msgid "Users"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 04e3220195a..fefba5eec4c 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "jméno elementu není nastaveno."
#: ajax/contact/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Nelze analyzovat kontakty"
#: ajax/contact/addproperty.php:56
msgid "Cannot add empty property."
@@ -84,7 +84,7 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "Chyba během přidávání vlastností kontaktu:"
#: ajax/contact/deleteproperty.php:37
msgid "Information about vCard is incorrect. Please reload the page."
@@ -242,8 +242,8 @@ msgstr "Nelze získat platnou adresu."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Chyba"
@@ -277,7 +277,7 @@ msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Chyba při otevírání obrázku profilu"
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -287,6 +287,10 @@ msgstr "Vybrat typ"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
+msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na dokončení operace."
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
msgstr ""
#: js/loader.js:49
@@ -303,11 +307,11 @@ msgstr "neimportováno."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Zobrazované jméno nemůže zůstat prázdné."
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresář nenalezen:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -381,55 +385,55 @@ msgstr "Narozeniny"
#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "Pracovní"
#: lib/app.php:185
msgid "Call"
-msgstr ""
+msgstr "Volat"
#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "Klienti"
#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "Dodavatel"
#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "Prázdniny"
#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "Nápady"
#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Cestování"
#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "Schůzka"
#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "Ostatní"
#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "Osobní"
#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "Projekty"
#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "Dotazy"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -449,7 +453,7 @@ msgstr "Import"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
@@ -461,51 +465,51 @@ msgstr "Zavřít"
#: templates/index.php:37
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Klávesoví zkratky"
#: templates/index.php:39
msgid "Navigation"
-msgstr ""
+msgstr "Navigace"
#: templates/index.php:42
msgid "Next contact in list"
-msgstr ""
+msgstr "Následující kontakt v seznamu"
#: templates/index.php:44
msgid "Previous contact in list"
-msgstr ""
+msgstr "Předchozí kontakt v seznamu"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Rozbalit/sbalit aktuální Adresář"
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "Následující Adresář"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "Předchozí Adresář"
#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "Akce"
#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "Občerstvit seznam kontaktů"
#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "Přidat kontakt"
#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "Předat nový Adresář"
#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
+msgstr "Odstranit aktuální kontakt"
#: templates/part.contact.php:17
msgid "Drop photo to upload"
@@ -551,15 +555,15 @@ msgstr "Zadejte přezdívku"
#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "Web"
#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
#: templates/part.contact.php:44
msgid "Go to web site"
-msgstr ""
+msgstr "Přejít na web"
#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
@@ -656,11 +660,11 @@ msgstr "PO box"
#: templates/part.edit_address_dialog.php:24
msgid "Street address"
-msgstr ""
+msgstr "Ulice"
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "Ulice a číslo"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -668,7 +672,7 @@ msgstr "Rozšířené"
#: templates/part.edit_address_dialog.php:33
msgid "Apartment number etc."
-msgstr ""
+msgstr "Byt číslo atd."
#: templates/part.edit_address_dialog.php:36
#: templates/part.edit_address_dialog.php:39
@@ -681,7 +685,7 @@ msgstr "Kraj"
#: templates/part.edit_address_dialog.php:45
msgid "E.g. state or province"
-msgstr ""
+msgstr "Např. stát nebo okres"
#: templates/part.edit_address_dialog.php:48
msgid "Zipcode"
@@ -689,7 +693,7 @@ msgstr "PSČ"
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "PSČ"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -810,15 +814,15 @@ msgstr "Nastavit adresář"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "Vybrat Adresář"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
-msgstr ""
+msgstr "Vložte jméno"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
-msgstr ""
+msgstr "Vložte popis"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -838,11 +842,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "Zobrazit odklaz CardDAV:"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Zobrazit odkaz VCF pouze pro čtení"
#: templates/settings.php:26
msgid "Download"
@@ -858,11 +862,11 @@ msgstr "Nový adresář"
#: templates/settings.php:41
msgid "Name"
-msgstr ""
+msgstr "Název"
#: templates/settings.php:42
msgid "Description"
-msgstr ""
+msgstr "Popis"
#: templates/settings.php:43
msgid "Save"
@@ -874,4 +878,4 @@ msgstr "Storno"
#: templates/settings.php:49
msgid "More..."
-msgstr ""
+msgstr "Více..."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index b168a2b7e1e..ce5a00fe065 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:26+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr "Soubory"
#: js/fileactions.js:95
msgid "Unshare"
-msgstr ""
+msgstr "Odsdílet"
#: js/fileactions.js:97 templates/index.php:56
msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "Vymazat"
#: js/filelist.js:141
msgid "already exists"
-msgstr ""
+msgstr "již existuje"
#: js/filelist.js:141
msgid "replace"
-msgstr ""
+msgstr "zaměnit"
#: js/filelist.js:141
msgid "cancel"
-msgstr ""
+msgstr "storno"
#: js/filelist.js:195
msgid "replaced"
-msgstr ""
+msgstr "zaměněno"
#: js/filelist.js:195
msgid "with"
-msgstr ""
+msgstr "s"
#: js/filelist.js:195 js/filelist.js:256
msgid "undo"
-msgstr ""
+msgstr "zpět"
#: js/filelist.js:256
msgid "deleted"
-msgstr ""
+msgstr "smazáno"
#: js/files.js:170
msgid "generating ZIP-file, it may take some time."
@@ -113,27 +113,27 @@ msgstr "Nahrávání zrušeno"
msgid "Invalid name, '/' is not allowed."
msgstr "Špatné jméno, znak '/' není povolen"
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
msgid "Size"
msgstr "Velikost"
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
msgid "Modified"
msgstr "Změněno"
-#: js/files.js:659
+#: js/files.js:722
msgid "folder"
msgstr "adresář"
-#: js/files.js:661
+#: js/files.js:724
msgid "folders"
msgstr "adresáře"
-#: js/files.js:669
+#: js/files.js:732
msgid "file"
msgstr "soubor"
-#: js/files.js:671
+#: js/files.js:734
msgid "files"
msgstr "soubory"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 31ccf1b3f90..4055cc18fcc 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:33+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Kryptování"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Při kryptování vynechat následující typy souborů"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Žádný"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Povolit kryptování"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 67d9a7179e8..26ba61410b1 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:38+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Vaše sdílené soubory"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Položka"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Sdíleno s:"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Práva"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Číst"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Editovat"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Smazat"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Povolit další sdílení"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Povolit uživatelům dále sdílet soubory, které sami nevlastní"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 15207fae022..cac58a2122d 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 10:32+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Vypršení všech verzí"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Povolit verzování souborů"
diff --git a/l10n/cs_CZ/gallery.po b/l10n/cs_CZ/gallery.po
index 08c9c2054b5..f24db5838a0 100644
--- a/l10n/cs_CZ/gallery.po
+++ b/l10n/cs_CZ/gallery.po
@@ -10,88 +10,32 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/owncloud/language/cs_CZ/)\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:30+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: appinfo/app.php:37
+#: appinfo/app.php:39
msgid "Pictures"
msgstr "Obrázky"
-#: js/album_cover.js:44
+#: js/pictures.js:12
msgid "Share gallery"
-msgstr ""
+msgstr "Sdílet galerii"
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
msgid "Error: "
-msgstr ""
+msgstr "Chyba: "
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
msgid "Internal error"
-msgstr ""
-
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "Nastavení"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "Znovu prohledat"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Zastavit"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Sdílet"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Zpět"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Potvrzení odebrání"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Chcete odstranit album?"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Změnit název alba"
+msgstr "Vnitřní chyba"
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Název nového alba"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Přehrávání"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 2d67565ff56..f6c62f88034 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:24+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,96 +18,96 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: app.php:287
+#: app.php:288
msgid "Help"
-msgstr ""
+msgstr "Nápověda"
-#: app.php:294
+#: app.php:295
msgid "Personal"
-msgstr ""
+msgstr "Osobní"
-#: app.php:299
+#: app.php:300
msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
-#: app.php:304
+#: app.php:305
msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
-#: app.php:311
+#: app.php:312
msgid "Apps"
-msgstr ""
+msgstr "Aplikace"
-#: app.php:313
+#: app.php:314
msgid "Admin"
-msgstr ""
+msgstr "Admin"
#: files.php:245
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Stahování ZIPu je vypnuto."
#: files.php:246
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Soubory je nutno stahovat samostatně."
#: files.php:246 files.php:271
msgid "Back to Files"
-msgstr ""
+msgstr "Zpět k souborům"
#: files.php:270
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Vybarné soubory jsou pro vytvoření zipu příliš velké."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikace není povolena"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autorizace"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Realce expirovala. Obnovte prosím stranu."
#: template.php:86
msgid "seconds ago"
-msgstr ""
+msgstr "před vteřinami"
#: template.php:87
msgid "1 minute ago"
-msgstr ""
+msgstr "před 1 minutou"
#: template.php:88
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "před %d minutami"
#: template.php:91
msgid "today"
-msgstr ""
+msgstr "dnes"
#: template.php:92
msgid "yesterday"
-msgstr ""
+msgstr "včera"
#: template.php:93
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "před %d dny"
#: template.php:94
msgid "last month"
-msgstr ""
+msgstr "minulý měsíc"
#: template.php:95
msgid "months ago"
-msgstr ""
+msgstr "před měsíci"
#: template.php:96
msgid "last year"
-msgstr ""
+msgstr "loni"
#: template.php:97
msgid "years ago"
-msgstr ""
+msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 90e81ef9c85..64ed6cf9551 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nepodařílo se stáhnout seznam z App Store"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -44,7 +44,7 @@ msgstr "Chybný dotaz"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autorizace"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -52,7 +52,7 @@ msgstr "Jazyk byl změněn"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Chyba"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -72,23 +72,23 @@ msgstr "Česky"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Bezpečnostní upozornění"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "spustit jednu úlohu s každou nataženou stranou"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je registrován jako služba webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "použijte systémovou službu cron"
#: templates/admin.php:39
msgid "Log"
@@ -231,7 +231,7 @@ msgid "Other"
msgstr "Jiné"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 88b8270c806..25f623c83bd 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 16:01+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +20,146 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Hostitel"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Nelze vynechat protokol vyžadující SSL. Začněte s ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "V Rozšířeném nastavení můžete specifikovat pro své uživatele a skupiny element Base DN"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "DN uživatele"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "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
msgid "Password"
-msgstr ""
+msgstr "Heslo"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filtr uživatelských loginů"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Definuje filtr, který je aplikován v průběhu logování. %%uid nahrazuje uživatelské jméno během logování."
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "použijte %%uid pro rezervované místo, např. \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filtr uživateslkých seznamů"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Defunije filtr, který je plaikován při návratu uživatelů."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "bez rezervace místa, např. \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Filtr skupiny"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definuje filtr, který je aplikován při návratu skupin"
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "bez rezervace místa, např. \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Port"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Základní uživatelský strom"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Základní skupinový strom"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "Asociace člena skupiny"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Použijte TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Nepoužívejte pro SSL připojení, připojení selže."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP server nerozlišující velikost znaků (Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Vypněte ověřování SSL certifikátu"
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "pokud pracuje připojení pouze pokud je teto volba aktivní, importujte SSL certifikát LDAP serveru do Vašeho serveru ownCloud."
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Není doporučeno, pouze pro účely testování."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Pole pro zobrazované jméno uživatele"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Pole pro zobrazení jména skupiny"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "v bytech"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "ve vteřinách. Změna vyprázdní dočasnou paměť."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Nápověda"
diff --git a/l10n/cs_CZ/user_migrate.po b/l10n/cs_CZ/user_migrate.po
index f3602dccae2..74cee0cec42 100644
--- a/l10n/cs_CZ/user_migrate.po
+++ b/l10n/cs_CZ/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:51+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Export"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Během vytváření souboru exportu došlo k chybě"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Nastala chyba"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Export Vašeho uživatelského účtu"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Bude vytvořen komprimovaný soubor, obsahující Váš ownCloud účet."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Import uživatelského účtu"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip soubor uživatele ownCloud"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Import"
diff --git a/l10n/cs_CZ/user_openid.po b/l10n/cs_CZ/user_openid.po
index 14f4ed1354c..f2fe13f3345 100644
--- a/l10n/cs_CZ/user_openid.po
+++ b/l10n/cs_CZ/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin <fireball@atlas.cz>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 09:48+0000\n"
+"Last-Translator: Martin <fireball@atlas.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Toto je OpenID server endpoint. Více informací na"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identita: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Oblast: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Uživatel: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Login"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Chyba: <b>Uživatel není zvolen"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "s touto adresou se můžete autrorizovat na další strany"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Autorizovaný OpenID poskytovatel"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Vaše adresa na Wordpressu, Identi.ca, &hellip;"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index 7180b10c289..03723a78472 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr "Kunne ikke finde en gyldig adresse."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fejl"
@@ -291,6 +291,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -814,11 +818,11 @@ msgstr "Konfigurer adressebøger"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f647b2f179e..0a872f803a7 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -232,8 +232,8 @@ msgid "Other"
msgstr "Andet"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/de/admin_dependencies_chk.po b/l10n/de/admin_dependencies_chk.po
index ea25facb3ae..cbd173e470f 100644
--- a/l10n/de/admin_dependencies_chk.po
+++ b/l10n/de/admin_dependencies_chk.po
@@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Maurice Preuß <>, 2012.
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 20:46+0000\n"
+"Last-Translator: Maurice Preuß <>\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"
@@ -21,53 +24,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "Das Modul php-json wird von vielen Anwendungen zur internen Kommunikation benötigt."
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "Das Modul php-curl wird benötigt, um den Titel der Seite für die Lesezeichen hinzuzufügen."
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Das Modul php-gd wird für die Erzeugung der Vorschaubilder benötigt."
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Das Modul php-ldap wird für die Verbindung mit dem LDAP-Server benötigt."
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Das Modul php-zip wird für den gleichzeitigen Download mehrerer Dateien benötigt."
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Das Modul php_mb_multibyte wird benötigt, um das Encoding richtig zu handhaben."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Das Modul php-ctype wird benötigt, um Daten zu prüfen."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Das Modul php-xml wird benötigt, um Dateien über WebDAV zu teilen."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "Die Richtlinie allow_url_fopen in Ihrer php.ini sollte auf 1 gesetzt werden, um die Wissensbasis vom OCS-Server abrufen."
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Das Modul php-pdo wird benötigt, um Daten in der Datenbank zu speichern."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Status der Abhängigkeiten"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Benutzt von:"
diff --git a/l10n/de/admin_migrate.po b/l10n/de/admin_migrate.po
index e2c34ce2ce2..d4a6b315a18 100644
--- a/l10n/de/admin_migrate.po
+++ b/l10n/de/admin_migrate.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:34+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +21,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Diese ownCloud-Instanz exportieren."
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Dies wird eine komprimierte Datei erzeugen, welche die Daten dieser ownCloud-Instanz enthält.\n Bitte wählen Sie den Exporttyp:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Exportieren"
diff --git a/l10n/de/calendar.po b/l10n/de/calendar.po
index 0aada56b320..449a5034197 100644
--- a/l10n/de/calendar.po
+++ b/l10n/de/calendar.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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 20:28+0000\n"
-"Last-Translator: driz <driz@i2pmail.org>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 11:28+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\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"
@@ -776,7 +776,7 @@ msgstr "Lösche den Zwischenspeicher für wiederholende Veranstaltungen"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 2550ffd9033..03f68de3e78 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 20:22+0000\n"
-"Last-Translator: driz <driz@i2pmail.org>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 09:39+0000\n"
+"Last-Translator: Phi Lieb <>\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"
@@ -256,8 +256,8 @@ msgstr "Konnte keine gültige Adresse abrufen"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fehler"
@@ -303,6 +303,10 @@ msgid ""
"them to be deleted."
msgstr "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "Möchtest du diese Adressbücher zusammenführen?"
+
#: js/loader.js:49
msgid "Result: "
msgstr "Ergebnis: "
@@ -331,7 +335,7 @@ msgstr "Dies ist nicht dein Adressbuch."
msgid "Contact could not be found."
msgstr "Kontakt konnte nicht gefunden werden."
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:112 templates/part.contact.php:116
msgid "Address"
msgstr "Adresse"
@@ -339,12 +343,12 @@ msgstr "Adresse"
msgid "Telephone"
msgstr "Telefon"
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:114 templates/part.contact.php:115
msgid "Email"
msgstr "E-Mail"
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
msgid "Organization"
msgstr "Organisation"
@@ -388,8 +392,8 @@ msgstr "Pager"
msgid "Internet"
msgstr "Internet"
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:183 templates/part.contact.php:44
+#: templates/part.contact.php:113
msgid "Birthday"
msgstr "Geburtstag"
@@ -541,113 +545,113 @@ msgstr "Neues Foto hochladen"
msgid "Select photo from ownCloud"
msgstr "Foto aus der ownCloud auswählen"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
msgid "Edit name details"
msgstr "Name ändern"
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:33
msgid "Delete"
msgstr "Löschen"
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
msgid "Nickname"
msgstr "Spitzname"
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
msgid "Enter nickname"
msgstr "Spitzname angeben"
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
msgid "Web site"
msgstr "Webseite"
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
msgid "http://www.somesite.com"
msgstr "http://www.somesite.com"
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
msgid "Go to web site"
msgstr "Webseite aufrufen"
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
msgid "dd-mm-yyyy"
msgstr "dd.mm.yyyy"
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
msgid "Groups"
msgstr "Gruppen"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
msgid "Separate groups with commas"
msgstr "Gruppen mit Komma getrennt"
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
msgid "Edit groups"
msgstr "Gruppen editieren"
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
msgid "Preferred"
msgstr "Bevorzugt"
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
msgid "Please specify a valid email address."
msgstr "Bitte eine gültige E-Mail-Adresse angeben."
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
msgid "Enter email address"
msgstr "E-Mail-Adresse angeben"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
msgid "Mail to address"
msgstr "E-Mail an diese Adresse schreiben"
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
msgid "Delete email address"
msgstr "E-Mail-Adresse löschen"
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
msgid "Enter phone number"
msgstr "Telefonnummer angeben"
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
msgid "Delete phone number"
msgstr "Telefonnummer löschen"
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
msgid "View on map"
msgstr "Auf Karte anzeigen"
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
msgid "Edit address details"
msgstr "Adressinformationen ändern"
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
msgid "Add notes here."
msgstr "Füge hier Notizen ein."
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
msgid "Add field"
msgstr "Feld hinzufügen"
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
msgid "Phone"
msgstr "Telefon"
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
msgid "Note"
msgstr "Notiz"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
msgid "Download contact"
msgstr "Kontakt herunterladen"
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
msgid "Delete contact"
msgstr "Kontakt löschen"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 4d9de10e67b..84c825dfd96 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 08:18+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Externer Speicher"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Mount-Point"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Backend"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Optionen"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Zutreffend"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Mount-Point hinzufügen"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Nicht definiert"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Alle Benutzer"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Gruppen"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Benutzer"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL-Root-Zertifikate"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Root-Zertifikate importieren"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Externer Speicher für Benutzer aktivieren"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Erlaubt Benutzern Ihre eigenen externen Speicher einzubinden"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 120bbc8dd65..85e27c2e094 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:38+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Ihre geteilten Dateien"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Objekt"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Teilen mit"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Berechtigungen"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Lesen"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Austausch ermöglichen"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Benutzer dürfen Dateien nochmals teilen, auch wenn sie nicht der Besitzer dieser Dateien sind."
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index f8037f6cbe5..789af981fbf 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 08:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Alle Versionen löschen"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Datei-Versionierung aktivieren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 1f8eb50a340..694e39fb625 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 10:12+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\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"
@@ -79,19 +79,19 @@ msgstr "Sicherheitshinweis"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Führe eine Aufgabe pro geladener Seite aus."
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php ist beim Webcron-Service registriert"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "Nutze System-Cron-Service"
#: templates/admin.php:39
msgid "Log"
@@ -234,8 +234,8 @@ msgid "Other"
msgstr "Andere"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Unteradministrator"
+msgid "Group Admin"
+msgstr "Gruppenadministrator"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/de/tasks.po b/l10n/de/tasks.po
index ab28b639e74..ad1bfcf952b 100644
--- a/l10n/de/tasks.po
+++ b/l10n/de/tasks.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:49+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +21,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Datum/Uhrzeit ungültig"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Aufgaben"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Keine Kategorie"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Nicht angegeben"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=am höchsten"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=Durchschnitt"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=am niedrigsten"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Leere Zusammenfassung"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Ungültige Prozent abgeschlossen"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Falsche Priorität"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Aufgabe hinzufügen"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Nach Fälligkeit sortieren"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Nach Kategorie sortieren "
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Nach Fertigstellung sortieren"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Nach Ort sortieren"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Nach Priorität sortieren"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Nach Label sortieren"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Lade Aufgaben..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Wichtig"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Mehr"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Weniger"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 090e0193512..6e4c7880b7d 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Maurice Preuß <>, 2012.
+# Phi Lieb <>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 09:48+0000\n"
+"Last-Translator: Phi Lieb <>\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"
@@ -19,24 +21,24 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Host"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Du kannst das Protokoll auslassen, außer wenn du SSL benötiogst. Beginne dann __mit__ ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Basis-DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "Benutzer-DN"
#: templates/settings.php:10
msgid ""
@@ -47,31 +49,31 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Passwort"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Lass die Felder von DN und Passwort für anonymen Zugang leer."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Benutzer Login Filter"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Benutzer Filter Liste"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
@@ -83,7 +85,7 @@ msgstr ""
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Gruppen Filter"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +97,7 @@ msgstr ""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Port"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -115,7 +117,7 @@ msgstr ""
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Verwenden Sie es nicht für SSL-Verbindungen, wird es scheitern."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +125,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Schalte die SSL Zertifikatsprüfung aus."
#: templates/settings.php:23
msgid ""
@@ -153,12 +155,12 @@ msgstr ""
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "in bytes"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "in Sekunden. Eine Änderung leert den Cache."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Hilfe"
diff --git a/l10n/de/user_migrate.po b/l10n/de/user_migrate.po
index b46b8e12f40..4423a018e2b 100644
--- a/l10n/de/user_migrate.po
+++ b/l10n/de/user_migrate.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:51+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +21,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Export"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Beim Export der Datei ist etwas schief gegangen."
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Es ist ein Fehler aufgetreten."
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Ihr Konto exportieren"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Eine komprimierte Datei wird erzeugen, die Ihr ownCloud-Konto enthält."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Konto importieren"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip-Archiv mit Benutzerdaten"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Importieren"
diff --git a/l10n/de/user_openid.po b/l10n/de/user_openid.po
index 345d5452d85..57865585448 100644
--- a/l10n/de/user_openid.po
+++ b/l10n/de/user_openid.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <niko@nik-o-mat.de>, 2012.
+# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:54+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Dies ist ein OpenID-Server-Endpunkt. Für weitere Informationen schauen Sie sich folgendes an:"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identität: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Bereich: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Benutzer: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Anmelden"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Fehler: <b> Kein Benutzer gewählt"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "Sie können sich auf anderen Seiten mit dieser Adresse authentifizieren."
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Authorisierter OpenID-Anbieter"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Ihre Adresse bei Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 548db19793d..bb902999413 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -7,15 +7,16 @@
# Dimitris M. <monopatis@gmail.com>, 2012.
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# Marios Bekatoros <>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
# <vagelis@cyberdest.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -245,8 +246,8 @@ msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Σφάλμα"
@@ -280,7 +281,7 @@ msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Σφάλμα στην φόρτωση εικόνας προφίλ."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -292,6 +293,10 @@ msgid ""
"them to be deleted."
msgstr "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Αποτέλεσμα: "
@@ -306,11 +311,11 @@ msgstr " απέτυχε."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Το όνομα προβολής δεν μπορεί να είναι κενό. "
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "Το βιβλίο διευθύνσεων δεν βρέθηκε:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -484,11 +489,11 @@ msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου δι
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "Επόμενο βιβλίο διευθύνσεων"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "Προηγούμενο βιβλίο διευθύνσεων"
#: templates/index.php:54
msgid "Actions"
@@ -815,11 +820,11 @@ msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
msgid "Select Address Books"
msgstr "Επέλεξε βιβλίο διευθύνσεων"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Εισαγωγή ονόματος"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Εισαγωγή περιγραφής"
@@ -841,11 +846,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "Εμφάνιση συνδέσμου CardDav"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Εμφάνιση συνδέσμου VCF μόνο για ανάγνωση"
#: templates/settings.php:26
msgid "Download"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 60e4a324fd3..2352c5f7951 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -7,15 +7,16 @@
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# <icewind1991@gmail.com>, 2012.
# Marios Bekatoros <>, 2012.
+# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
# <petros.kyladitis@gmail.com>, 2011.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -53,7 +54,7 @@ msgstr "Η γλώσσα άλλαξε"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Σφάλμα"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -77,19 +78,19 @@ msgstr "Προειδοποίηση Ασφαλείας"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "Χρήση της υπηρεσίας cron του συστήματος"
#: templates/admin.php:39
msgid "Log"
@@ -232,8 +233,8 @@ msgid "Other"
msgstr "Άλλα"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/eo/admin_dependencies_chk.po b/l10n/eo/admin_dependencies_chk.po
index be22a0e5e85..5fb88e68aed 100644
--- a/l10n/eo/admin_dependencies_chk.po
+++ b/l10n/eo/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:59+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"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "La modulo php-json necesas por komuniko inter la multaj aplikaĵoj"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "La modulo php-curl necesas por venigi la paĝotitolon dum aldono de legosigno"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "La modulo php-gd necesas por krei bildetojn."
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "La modulo php-ldap necesas por konekti al via LDAP-servilo."
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "La modulo php-zip necesas por elŝuti plurajn dosierojn per unu fojo."
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "La modulo php-mb_multibyte necesas por ĝuste administri la kodprezenton."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "La modulo php-ctype necesas por validkontroli datumojn."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "La modulo php-xml necesas por kunhavigi dosierojn per WebDAV."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "La ordono allow_url_fopen de via php.ini devus valori 1 por ricevi scibazon el OCS-serviloj"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "La modulo php-pdo necesas por konservi datumojn de ownCloud en datumbazo."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Stato de dependoj"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Uzata de:"
diff --git a/l10n/eo/admin_migrate.po b/l10n/eo/admin_migrate.po
index ca3e132bd3b..61384915c2a 100644
--- a/l10n/eo/admin_migrate.po
+++ b/l10n/eo/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:32+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"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Malenporti ĉi tiun aperon de ownCloud"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Ĉi tio kreos densigitan dosieron, kiu enhavos la datumojn de ĉi tiu apero de ownCloud.\nBonvolu elekti la tipon de malenportado:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Malenporti"
diff --git a/l10n/eo/calendar.po b/l10n/eo/calendar.po
index b0799bee788..4fc02e02b0c 100644
--- a/l10n/eo/calendar.po
+++ b/l10n/eo/calendar.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:17+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"
@@ -59,7 +59,7 @@ msgstr "okazaĵoj estas konservitaj en via kalendaro"
#: ajax/settings/guesstimezone.php:25
msgid "New Timezone:"
-msgstr "Nova horzono:"
+msgstr "Nova horozono:"
#: ajax/settings/settimezone.php:23
msgid "Timezone changed"
@@ -478,7 +478,7 @@ msgstr "Hodiaŭ"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "Agordo"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -732,7 +732,7 @@ msgstr "ĉe"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "Ĝenerala"
#: templates/settings.php:15
msgid "Timezone"
@@ -740,11 +740,11 @@ msgstr "Horozono"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "Aŭtomate ĝisdatigi la horozonon"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "Horoformo"
#: templates/settings.php:57
msgid "24h"
@@ -756,7 +756,7 @@ msgstr "12h"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "Komenci semajnon je"
#: templates/settings.php:76
msgid "Cache"
@@ -768,7 +768,7 @@ msgstr "Forviŝi kaŝmemoron por ripeto de okazaĵoj"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URL-oj"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7a635c7d611..7c50fee01b4 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 17:14+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"
@@ -67,7 +67,7 @@ msgstr "eronomo ne agordiĝis."
#: ajax/contact/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ne eblis analizi kontakton:"
#: ajax/contact/addproperty.php:56
msgid "Cannot add empty property."
@@ -241,8 +241,8 @@ msgstr "Ne eblis ekhavi validan adreson."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Eraro"
@@ -252,7 +252,7 @@ msgstr "Ĉi tiu propraĵo devas ne esti malplena."
#: js/contacts.js:741
msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Ne eblis seriigi erojn."
#: js/contacts.js:850 js/contacts.js:868
msgid ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Rezulto: "
@@ -392,7 +396,7 @@ msgstr "Klientoj"
#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "Liveranto"
#: lib/app.php:188
msgid "Holidays"
@@ -404,11 +408,11 @@ msgstr "Ideoj"
#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Vojaĝo"
#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "Jubileo"
#: lib/app.php:192
msgid "Meeting"
@@ -468,11 +472,11 @@ msgstr "Navigado"
#: templates/index.php:42
msgid "Next contact in list"
-msgstr "Sekva kontakto en la listo"
+msgstr "Jena kontakto en la listo"
#: templates/index.php:44
msgid "Previous contact in list"
-msgstr "Malsekva kontakto en la listo"
+msgstr "Maljena kontakto en la listo"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
@@ -480,11 +484,11 @@ msgstr ""
#: templates/index.php:48
msgid "Next addressbook"
-msgstr "Sekva adresaro"
+msgstr "Jena adresaro"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr "Malsekva adresaro"
+msgstr "Maljena adresaro"
#: templates/index.php:54
msgid "Actions"
@@ -811,11 +815,11 @@ msgstr "Agordi adresarojn"
msgid "Select Address Books"
msgstr "Elektu adresarojn"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Enigu nomon"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Enigu priskribon"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 8d72ea6ef56..fbea58f5ddb 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
# Michael Moroni <haikara90@gmail.com>, 2012.
# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-02 02:02+0200\n"
-"PO-Revision-Date: 2012-08-02 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 16:36+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"
@@ -35,55 +36,55 @@ msgstr "Ĉi tiu kategorio jam ekzistas: "
msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:573
+#: js/js.js:575
msgid "January"
msgstr "Januaro"
-#: js/js.js:573
+#: js/js.js:575
msgid "February"
msgstr "Februaro"
-#: js/js.js:573
+#: js/js.js:575
msgid "March"
msgstr "Marto"
-#: js/js.js:573
+#: js/js.js:575
msgid "April"
msgstr "Aprilo"
-#: js/js.js:573
+#: js/js.js:575
msgid "May"
msgstr "Majo"
-#: js/js.js:573
+#: js/js.js:575
msgid "June"
msgstr "Junio"
-#: js/js.js:574
+#: js/js.js:576
msgid "July"
msgstr "Julio"
-#: js/js.js:574
+#: js/js.js:576
msgid "August"
msgstr "Aŭgusto"
-#: js/js.js:574
+#: js/js.js:576
msgid "September"
msgstr "Septembro"
-#: js/js.js:574
+#: js/js.js:576
msgid "October"
msgstr "Oktobro"
-#: js/js.js:574
+#: js/js.js:576
msgid "November"
msgstr "Novembro"
-#: js/js.js:574
+#: js/js.js:576
msgid "December"
msgstr "Decembro"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 3e173e196c2..dbcedb1a56a 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:41+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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Ĉifrado"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Malinkluzivigi la jenajn dosiertipojn el ĉifrado"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Nenio"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Kapabligi ĉifradon"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 089953a7283..11e4211e707 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 22:09+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"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Malena memorilo"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Surmetingo"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Motoro"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Agordo"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Malneproj"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Aplikebla"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Aldoni surmetingon"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Nenio agordita"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Ĉiuj uzantoj"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Grupoj"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Uzantoj"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Forigi"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Radikaj SSL-atestoj"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Enporti radikan ateston"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Kapabligi malenan memorilon de uzanto"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index ba8f508b669..bab4de8df6d 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:32+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"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Viaj kunhavigitaj dosieroj"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Ero"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Kunhavigita kun"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Permesoj"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Legi"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Redakti"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Forigi"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Kapabligi rekunhavigon"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Permesi al uzantoj rekunhavigi dosierojn, kiujn ili ne posedas"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 0d6b7356f99..23851036eaa 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 20:20+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"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Eksvalidigi ĉiujn eldonojn"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Kapabligi dosiereldonkontrolon"
diff --git a/l10n/eo/media.po b/l10n/eo/media.po
index cc7a61cea58..135087b52cc 100644
--- a/l10n/eo/media.po
+++ b/l10n/eo/media.po
@@ -3,29 +3,30 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2012.
# Michael Moroni <haikara90@gmail.com>, 2012.
-# <mstreet@kde.org.ar>, 2011.
+# <mstreet@kde.org.ar>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/owncloud/language/eo/)\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 16:47+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
msgid "Music"
msgstr "Muziko"
#: js/music.js:18
msgid "Add album to playlist"
-msgstr ""
+msgstr "Aldoni albumon al ludlisto"
#: templates/music.php:3 templates/player.php:12
msgid "Play"
@@ -37,11 +38,11 @@ msgstr "Paŭzigi"
#: templates/music.php:5
msgid "Previous"
-msgstr "Antaŭa"
+msgstr "Maljena"
#: templates/music.php:6 templates/player.php:14
msgid "Next"
-msgstr "Sekva"
+msgstr "Jena"
#: templates/music.php:7
msgid "Mute"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 44965561de5..15e0d6d85ac 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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 17:13+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -73,23 +73,23 @@ msgstr "Sekureca averto"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "lanĉi unu taskon po ĉiu paĝo ŝargita"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php estas registrita kiel webcron-servilo"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "uzi la cron-servon de la sistemo"
#: templates/admin.php:39
msgid "Log"
-msgstr "Registro"
+msgstr "Protokolo"
#: templates/admin.php:67
msgid "More"
@@ -228,8 +228,8 @@ msgid "Other"
msgstr "Alia"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Subadministranto"
+msgid "Group Admin"
+msgstr "Grupadministranto"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/eo/tasks.po b/l10n/eo/tasks.po
index a829a6ae23a..c53752bc4cc 100644
--- a/l10n/eo/tasks.po
+++ b/l10n/eo/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:52+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"
@@ -19,88 +20,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Nevalida dato/horo"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Taskoj"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Neniu kategorio"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Nespecifita"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=plej alta"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=meza"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=plej malalta"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Malplena resumo"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Nevalida plenuma elcento"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Nevalida pligravo"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Aldoni taskon"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Ordigi laŭ limdato"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Ordigi laŭ listo"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Ordigi laŭ plenumo"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Ordigi laŭ loko"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Ordigi laŭ pligravo"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Ordigi laŭ etikedo"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Ŝargante taskojn..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Grava"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Pli"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Malpli"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Forigi"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 0a6274edd44..d83f307fe23 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:28+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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Gastigo"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Baz-DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -36,7 +37,7 @@ msgstr ""
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "Uzanto-DN"
#: templates/settings.php:10
msgid ""
@@ -47,63 +48,63 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Pasvorto"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filtrilo de uzantensaluto"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filtrilo de uzantolisto"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Filtrilo de grupo"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Pordo"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Baza uzantarbo"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Baza gruparbo"
#: templates/settings.php:20
msgid "Group-Member association"
@@ -111,19 +112,19 @@ msgstr ""
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Uzi TLS-on"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
#: templates/settings.php:23
msgid ""
@@ -133,32 +134,32 @@ msgstr ""
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ne rekomendata, uzu ĝin nur por testoj."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Kampo de vidignomo de uzanto"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Kampo de vidignomo de grupo"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "duumoke"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Helpo"
diff --git a/l10n/eo/user_migrate.po b/l10n/eo/user_migrate.po
index 079fff49c79..27ea6386b0b 100644
--- a/l10n/eo/user_migrate.po
+++ b/l10n/eo/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 19:36+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"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Malenporti"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Io malsukcesis dum la enportota dosiero generiĝis"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Eraro okazis"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Malenporti vian uzantokonton"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Ĉi tio kreos densigitan dosieron, kiu enhavas vian konton de ownCloud."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Enporti uzantokonton"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ZIP-dosiero de uzanto de ownCloud"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Enporti"
diff --git a/l10n/eo/user_openid.po b/l10n/eo/user_openid.po
index b982103d358..237164674bb 100644
--- a/l10n/eo/user_openid.po
+++ b/l10n/eo/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 21:05+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"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Ĉi tio estas finpunkto de OpenID-servilo. Por pli da informo, vidu"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Idento: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Regno: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Uzanto: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Ensaluti"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Eraro: <b>neniu uzanto estas elektita"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "Vi povas ensaluti en aliaj ejoj per tiu ĉi adreso"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Rajtigita OpenID-provizanto"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Via adreso ĉe Wordpress, Identi.ca&hellip;"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index d3ffeee5d35..ad0191c21f9 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -245,8 +245,8 @@ msgstr "Fallo : no hay dirección valida"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fallo"
@@ -292,6 +292,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado :"
@@ -815,11 +819,11 @@ msgstr "Configurar agenda"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Introducir nombre"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Introducir descripción"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 6f0dea3abea..fecace83b78 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -79,19 +79,19 @@ msgstr "Advertencia de seguridad"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ejecutar una tarea con cada página cargada"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php se registra en un servicio webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "usar servicio cron del sistema"
#: templates/admin.php:39
msgid "Log"
@@ -234,8 +234,8 @@ msgid "Other"
msgstr "Otro"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/es/tasks.po b/l10n/es/tasks.po
index 79d624ab38e..c7be467fb0c 100644
--- a/l10n/es/tasks.po
+++ b/l10n/es/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <juanma@kde.org.ar>, 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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 17:39+0000\n"
+"Last-Translator: juanman <juanma@kde.org.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Fecha/hora inválida"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Tareas"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Sin categoría"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Sin especificar"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=mayor"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=media"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=menor"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Resumen vacío"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Porcentaje completado inválido"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Prioridad inválida"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Agregar tarea"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Ordenar por"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Ordenar por lista"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Ordenar por completadas"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Ordenar por ubicación"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Ordenar por prioridad"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Ordenar por etiqueta"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Cargando tareas..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Importante"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Más"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Menos"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Borrar"
diff --git a/l10n/et_EE/admin_dependencies_chk.po b/l10n/et_EE/admin_dependencies_chk.po
index 589ff81c369..4e1dc1ab0c8 100644
--- a/l10n/et_EE/admin_dependencies_chk.po
+++ b/l10n/et_EE/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:47+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "php-json moodul on vajalik paljude rakenduse poolt omvahelise suhtlemise jaoks"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "php-curl moodul on vajalik lehe pealkirja tõmbamiseks järjehoidja lisamisel"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "php-gd moodul on vajalik sinu piltidest pisipiltide loomiseks"
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "php-ldap moodul on vajalik sinu ldap serveriga ühendumiseks"
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "php-zip moodul on vajalik mitme faili korraga alla laadimiseks"
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "php-mb_multibyte moodul on vajalik kodeerimise korrektseks haldamiseks."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "php-ctype moodul on vajalik andmete kontrollimiseks."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "php-xml moodul on vajalik failide jagamiseks webdav-iga."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "Sinu php.ini failis oleva direktiivi allow_url_fopen väärtuseks peaks määrama 1, et saaks tõmmata teadmistebaasi OCS-i serveritest"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "php-pdo moodul on vajalik owncloudi andmete salvestamiseks andmebaasi."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Sõltuvuse staatus"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Kasutab :"
diff --git a/l10n/et_EE/admin_migrate.po b/l10n/et_EE/admin_migrate.po
index c6f5f7eb0d8..1e02b724090 100644
--- a/l10n/et_EE/admin_migrate.po
+++ b/l10n/et_EE/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:41+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Ekspordi see ownCloudi paigaldus"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "See loob pakitud faili, milles on sinu owncloudi paigalduse andmed.\n Palun vali eksporditava faili tüüp:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Ekspordi"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 74db6a2d970..32a4a0173a2 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr "Kehtiva aadressi hankimine ebaõnnestus"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Viga"
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Tulemus: "
@@ -810,11 +814,11 @@ msgstr "Seadista aadressiraamatuid"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index de81587c37b..8a0593fa337 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:39+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Krüpteerimine"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Järgnevaid failitüüpe ära krüpteeri"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Pole"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Luba krüpteerimine"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 3321a99e086..3daaecb1633 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:32+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Väline salvestuskoht"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Ühenduspunkt"
#: templates/settings.php:8
msgid "Backend"
@@ -31,11 +32,11 @@ msgstr ""
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Seadistamine"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Valikud"
#: templates/settings.php:11
msgid "Applicable"
@@ -43,27 +44,27 @@ msgstr ""
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Lisa ühenduspunkt"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Pole määratud"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Kõik kasutajad"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Grupid"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Kasutajad"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Kustuta"
#: templates/settings.php:88
msgid "SSL root certificates"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 6a3fc45f755..96393b4b8f9 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:33+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Sinu jagatud failid"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Kirje"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Kellega jagatud"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Õigused"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Lugemine"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Muutmine"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Kustutamine"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Luba edasijagamine"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Luba kasutajatel jagada faile, mis pole nende omad"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index dccf6069c5d..fd569f5b70b 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:33+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Kõikide versioonide aegumine"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Luba failide versioonihaldus"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e5e997d1396..c41361db049 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Muu"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/et_EE/tasks.po b/l10n/et_EE/tasks.po
index 310756cc69e..042e2c4864f 100644
--- a/l10n/et_EE/tasks.po
+++ b/l10n/et_EE/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:36+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Vigane kuupäev/kellaaeg"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Ülesanded"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Kategooriat pole"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Määramata"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=kõrgeim"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=keskmine"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=madalaim"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Tühi kokkuvõte"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Vigane edenemise protsent"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Vigane tähtsus"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Lisa ülesanne"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Tähtaja järgi"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Nimekirja järgi"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Edenemise järgi"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Asukoha järgi"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Tähtsuse järjekorras"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Sildi järgi"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Ülesannete laadimine..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Tähtis"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Rohkem"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Vähem"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Kustuta"
diff --git a/l10n/et_EE/user_openid.po b/l10n/et_EE/user_openid.po
index 7944fd1d362..8be57b5de20 100644
--- a/l10n/et_EE/user_openid.po
+++ b/l10n/et_EE/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rivo Zängov <eraser@eraser.ee>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:48+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +20,15 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "See on OpenID serveri lõpp-punkt. Lisainfot vaata"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identiteet: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Tsoon: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index df6730af068..e5bd8a9638c 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Ezin izan da eposta baliagarri bat hartu."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Errorea"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Emaitza:"
@@ -812,11 +816,11 @@ msgstr "Konfiguratu helbide liburuak"
msgid "Select Address Books"
msgstr "Hautatu helbide-liburuak"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Sartu izena"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Sartu deskribapena"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index fc694e55594..d7ebcc2b282 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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -229,8 +229,8 @@ msgid "Other"
msgstr "Besteak"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index c0c80cfb384..96b07fd2758 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index d750261466f..82cc89a6207 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 585d7ae6c29..9744c2460b0 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr "Couldn't get a valid address."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "خطا"
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "نتیجه:"
@@ -810,11 +814,11 @@ msgstr "پیکربندی کتابچه ی نشانی ها"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 0c86f804605..38f01f759c0 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "سایر"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/fi/contacts.po b/l10n/fi/contacts.po
index 537fe182c32..2030f4fc3c1 100644
--- a/l10n/fi/contacts.po
+++ b/l10n/fi/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index c7d75c2d6ac..823276532f7 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/fi_FI/admin_migrate.po b/l10n/fi_FI/admin_migrate.po
index ba949be0876..ce68f4275d7 100644
--- a/l10n/fi_FI/admin_migrate.po
+++ b/l10n/fi_FI/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:55+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"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Vie tämä ownCloud-istanssi"
#: templates/settings.php:4
msgid ""
@@ -29,4 +30,4 @@ msgstr ""
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Vie"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 35b090e46b3..87156b512e5 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Virhe"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Tulos: "
@@ -813,11 +817,11 @@ msgstr "Muokkaa osoitekirjoja"
msgid "Select Address Books"
msgstr "Valitse osoitekirjat"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Anna nimi"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Anna kuvaus"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 62b43dfc312..89ad916e382 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 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-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:56+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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Salaus"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Jätä seuraavat tiedostotyypit salaamatta"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Ei mitään"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Käytä salausta"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 101691c0784..2cee464ea24 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 11:04+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"
@@ -19,23 +20,23 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Erillinen tallennusväline"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Liitospiste"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Taustaosa"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Asetukset"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Valinnat"
#: templates/settings.php:11
msgid "Applicable"
@@ -43,35 +44,35 @@ msgstr ""
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Lisää liitospiste"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Ei asetettu"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Kaikki käyttäjät"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Käyttäjät"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Poista"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL-juurivarmenteet"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Tuo juurivarmenne"
#: templates/settings.php:108
msgid "Enable User External Storage"
@@ -79,4 +80,4 @@ msgstr ""
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index defc8793baa..aa9872ecb1f 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:59+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"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Jakamasi tiedostot"
#: templates/list.php:6
msgid "Item"
@@ -31,24 +32,24 @@ msgstr ""
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Oikeudet"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Luku"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Muokkaus"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Poisto"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Käytä uudelleenjakoa"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Salli käyttäjien jakaa edelleen tiedostoja, joita he eivät omista"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 678c8cda62e..c4bdbdc5821 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 10:59+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"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Vanhenna kaikki versiot"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Käytä tiedostojen versiointia"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 0649c23395d..b45f1ed63e0 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 12:53+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"
@@ -73,7 +73,7 @@ msgstr "Turvallisuusvaroitus"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
@@ -85,7 +85,7 @@ msgstr ""
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "käytä järjestelmän cron-palvelua"
#: templates/admin.php:39
msgid "Log"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Muu"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/fi_FI/tasks.po b/l10n/fi_FI/tasks.po
index 0e179f0b479..cfbcb891b68 100644
--- a/l10n/fi_FI/tasks.po
+++ b/l10n/fi_FI/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 11:01+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"
@@ -19,11 +20,11 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Virheellinen päivä tai aika"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Tehtävät"
#: js/tasks.js:415
msgid "No category"
@@ -31,19 +32,19 @@ msgstr ""
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Määrittelemätön"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=korkein"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=keskitaso"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=matalin"
#: lib/app.php:81
msgid "Empty Summary"
@@ -55,11 +56,11 @@ msgstr ""
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Virheellinen prioriteetti"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Lisää tehtävä"
#: templates/tasks.php:4
msgid "Order Due"
@@ -87,7 +88,7 @@ msgstr ""
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Ladataan tehtäviä..."
#: templates/tasks.php:20
msgid "Important"
@@ -95,12 +96,12 @@ msgstr ""
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Enemmän"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Vähemmän"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Poista"
diff --git a/l10n/fi_FI/user_migrate.po b/l10n/fi_FI/user_migrate.po
index 17bff479f0d..b0ab6824519 100644
--- a/l10n/fi_FI/user_migrate.po
+++ b/l10n/fi_FI/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 11:06+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,28 +20,28 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Vie"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Jokin meni pieleen vientiä suorittaessa"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Tapahtui virhe"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Vie käyttäjätilisi"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Tämä luo ownCloud-käyttäjätilisi sisältävän pakatun tiedoston."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Tuo käyttäjätili"
#: templates/settings.php:15
msgid "ownCloud User Zip"
@@ -48,4 +49,4 @@ msgstr ""
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Tuo"
diff --git a/l10n/fr/admin_dependencies_chk.po b/l10n/fr/admin_dependencies_chk.po
index 9ac75de6c9d..36480849bec 100644
--- a/l10n/fr/admin_dependencies_chk.po
+++ b/l10n/fr/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-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-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 15:59+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "Le module php-json est requis pour l'inter-communication de nombreux modules."
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "Le module php-curl est requis afin de rapatrier le titre des pages lorsque vous ajoutez un marque-pages."
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Le module php-gd est requis afin de permettre la création d'aperçus pour vos images."
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Le module php-ldap est requis afin de permettre la connexion à votre serveur ldap."
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Le module php-zip est requis pour le téléchargement simultané de plusieurs fichiers."
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Le module php-mb_multibyte est requis pour une gestion correcte des encodages."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Le module php-ctype est requis pour la validation des données."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Le module php-xml est requis pour le partage de fichiers via webdav."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "La directive allow_url_fopen de votre fichier php.ini doit être à la valeur 1 afin de permettre le rapatriement de la base de connaissance depuis les serveurs OCS."
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "le module php-pdo est requis pour le stockage des données ownCloud en base de données."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Statut des dépendances"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Utilisé par :"
diff --git a/l10n/fr/admin_migrate.po b/l10n/fr/admin_migrate.po
index b2e53d208fb..a3f34310cc1 100644
--- a/l10n/fr/admin_migrate.po
+++ b/l10n/fr/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 15:51+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Exporter cette instance ownCloud"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Ceci va créer une archive compressée contenant les données de cette instance ownCloud.\n Veuillez choisir le type d'export :"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Exporter"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 6680c0a1830..87353de68a2 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -250,8 +250,8 @@ msgstr "Impossible de trouver une adresse valide."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erreur"
@@ -285,7 +285,7 @@ msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fich
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Erreur pendant le chargement de la photo de profil."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -297,6 +297,10 @@ msgid ""
"them to be deleted."
msgstr "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Résultat :"
@@ -820,11 +824,11 @@ msgstr "Paramétrer carnet d'adresses"
msgid "Select Address Books"
msgstr "Choix du carnet d'adresses"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Saisissez le nom"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Saisissez une description"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 76024f3a785..cbad09601fc 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-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-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 16:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Chiffrement"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Aucun"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Activer le chiffrement"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 75d8c064987..488a6924a4d 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 16:35+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Stockage externe"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Point de montage"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Infrastructure"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Options"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Disponible"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Ajouter un point de montage"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Aucun spécifié"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Tous les utilisateurs"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Groupes"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificats racine SSL"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importer un certificat racine"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Activer le stockage externe pour les utilisateurs"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 6e72c0e324a..60c8ad25a55 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:40+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Vos documents partagés"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Item"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Partagé avec"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Permissions"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Lecture"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Édition"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Effacement"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Permettre le repartage"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Permettre aux utilisateurs de repartager des fichiers dont ils ne sont pas propriétaires"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index c6176a9414d..74b1426e8c5 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:49+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Supprimer les versions intermédiaires"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Activer le versionnage"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 6682f4c9e0a..8fdbf74145f 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -79,19 +79,19 @@ msgstr "Alertes de sécurité"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "exécuter une tâche pour chaque page chargée"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php est enregistré comme un service webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "utiliser le service cron du système "
#: templates/admin.php:39
msgid "Log"
@@ -234,8 +234,8 @@ msgid "Other"
msgstr "Autre"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/fr/tasks.po b/l10n/fr/tasks.po
index 39d5b8c564d..69664e2e2f9 100644
--- a/l10n/fr/tasks.po
+++ b/l10n/fr/tasks.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Romain DEP. <rom1dep@gmail.com>, 2012.
+# Xavier BOUTEVILLAIN <xavier.boutevillain@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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 12:26+0000\n"
+"Last-Translator: Xavier BOUTEVILLAIN <xavier.boutevillain@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"
@@ -19,88 +21,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "date/heure invalide"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Tâches"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Sans catégorie"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Non spécifié"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=le plus important"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=importance moyenne"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=le moins important"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Résumé vide"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Pourcentage d'achèvement invalide"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Priorité invalide"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Ajouter une tâche"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Echéance tâche"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Liste tâche"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Tâche réalisée"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Lieu"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Priorité"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Etiquette tâche"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Chargement des tâches…"
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Important"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Plus"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Moins"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index a48dcb60944..afaa4b5d413 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <zrk951@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 17:06+0000\n"
+"Last-Translator: Zertrin <zrk951@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"
@@ -19,43 +20,43 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Hôte"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "DN de base"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "DN Utilisateur"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "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
msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pour l'accès anonyme, laisser le DN et le mot de passe vides."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filtre d'identifiants utilisateur"
#: templates/settings.php:12
#, php-format
@@ -71,31 +72,31 @@ msgstr ""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filtre d'utilisateurs"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Filtre de groupes"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Port"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -107,33 +108,33 @@ msgstr ""
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "Association groupe-membre"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Utiliser TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Serveur LDAP insensible à la casse (Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Désactiver la validation du certificat SSL"
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Non recommendé, utilisation pour tests uniquement."
#: templates/settings.php:24
msgid "User Display Name Field"
@@ -141,7 +142,7 @@ msgstr ""
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud"
#: templates/settings.php:25
msgid "Group Display Name Field"
@@ -149,16 +150,16 @@ msgstr ""
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "en octets"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "en secondes. Tout changement vide le cache."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Aide"
diff --git a/l10n/fr/user_migrate.po b/l10n/fr/user_migrate.po
index 3d50d1f56a5..6528dc9e745 100644
--- a/l10n/fr/user_migrate.po
+++ b/l10n/fr/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:23+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Exporter"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Une erreur s'est produit pendant la génération du fichier d'export"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Une erreur s'est produite"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Exportez votre compte utilisateur"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Cette action va créer une archive compressée qui contiendra les données de votre compte ownCloud."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Importer un compte utilisateur"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Archive Zip de l'utilisateur"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Importer"
diff --git a/l10n/fr/user_openid.po b/l10n/fr/user_openid.po
index 5dafa24dd91..df7952aa7cc 100644
--- a/l10n/fr/user_openid.po
+++ b/l10n/fr/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 16:05+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Ce serveur est un point d'accès OpenID. Pour plus d'informations, veuillez consulter"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identité : <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Domaine : <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Utilisateur : <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Connexion"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Erreur : <b>Aucun nom d'utilisateur n'a été saisi"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "vous pouvez vous authentifier sur d'autres sites grâce à cette adresse"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Fournisseur d'identité OpenID autorisé"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Votre adresse Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 609d9516210..972682b6ebb 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Non se puido obter un enderezo de correo válido."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado: "
@@ -811,11 +815,11 @@ msgstr "Configurar libretas de enderezos"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index f48a73f502e..8c45f0bd139 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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Non se puido cargar a lista desde a App Store"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -41,7 +41,7 @@ msgstr "Petición incorrecta"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "Erro na autenticación"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -49,7 +49,7 @@ msgstr "O idioma mudou"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Erro"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -69,23 +69,23 @@ msgstr "Galego"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Aviso de seguridade"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "executar unha tarefa con cada páxina cargada"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php está rexistrada como un servizo webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "utilice o servizo cron do sistema"
#: templates/admin.php:39
msgid "Log"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Outro"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 95a5b199da3..9660e8a9afe 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -812,11 +816,11 @@ msgstr "הגדר ספרי כתובות"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 194fa463ab2..cd199ce76a6 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
msgstr "אחר"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 75ab0abdb22..8e1653696d7 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 77abd3cbb37..1d03b6f4e4a 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "ostali"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index 5c441e68bec..dcbf9514b9b 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr "Érvényes cím lekérése sikertelen"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Hiba"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Eredmény: "
@@ -813,11 +817,11 @@ msgstr "Címlisták beállítása"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 4040e9e5649..0b5b94d6c6c 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,8 +228,8 @@ msgid "Other"
msgstr "Egyéb"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "al-Admin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 582ad7d76f7..1395ba92c24 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index dcc8a876799..13b4e166358 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 5a436a7a255..fd0e67d2cd5 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 62fb9fe13f9..fe56aae5b90 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Altere"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 3e58eff041b..abc2bc17b11 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d8c65bc9f61..8b4f28abc2e 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Lain-lain"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 2fec0e37284..f17c7177a90 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index d03aaed81d4..e6873fc49b4 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/it/admin_dependencies_chk.po b/l10n/it/admin_dependencies_chk.po
index c2abc92923e..46d1082e634 100644
--- a/l10n/it/admin_dependencies_chk.po
+++ b/l10n/it/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:51+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "Il modulo php-json è richiesto per l'intercomunicazione di diverse applicazioni"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "Il modulo php-curl è richiesto per scaricare il titolo della pagina quando si aggiunge un segnalibro"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Il modulo php-gd è richiesto per creare miniature delle tue immagini"
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Il modulo php-ldap è richiesto per collegarsi a un server ldap"
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Il modulo php-zip è richiesto per scaricare diversi file contemporaneamente"
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Il modulo php-mb_multibyte è richiesto per gestire correttamente la codifica."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Il modulo php-ctype è richiesto per la validazione dei dati."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Il modulo php-xml è richiesto per condividere i file con webdav."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "La direttiva allow_url_fopen del tuo php.ini deve essere impostata a 1 per recuperare la base di conoscenza dai server di OCS"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Il modulo php-pdo è richiesto per archiviare i dati di ownCloud in un database."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Stato delle dipendenze"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Usato da:"
diff --git a/l10n/it/admin_migrate.po b/l10n/it/admin_migrate.po
index e94f4f4bb9f..2da23d877f8 100644
--- a/l10n/it/admin_migrate.po
+++ b/l10n/it/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:47+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"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Esporta questa istanza di ownCloud"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Questa operazione creerà un file compresso che contiene i dati dell'istanza di ownCloud. Scegli il tipo di esportazione:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Esporta"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index b702f2eab37..ca6e21df7c8 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/contacts.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 06:59+0000\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:27+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"
@@ -243,8 +243,8 @@ msgstr "Impossibile ottenere un indirizzo valido."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Errore"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "Vuoi unire queste rubriche?"
+
#: js/loader.js:49
msgid "Result: "
msgstr "Risultato: "
@@ -813,11 +817,11 @@ msgstr "Configura rubriche"
msgid "Select Address Books"
msgstr "Seleziona rubriche"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Inserisci il nome"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Inserisci una descrizione"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index cc162fd77e4..573a32a14a5 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 11:49+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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Cifratura"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Escludi i seguenti tipi di file dalla cifratura"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Nessuna"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Abilita cifratura"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 23b431e7161..801511ce3b5 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 14:42+0000\n"
+"Last-Translator: Innocenzo Ventre <el.diabl09@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"
@@ -19,64 +21,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Archiviazione esterna"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Punto di mount"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Motore"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Configurazione"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Opzioni"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Applicabile"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Aggiungi punto di mount"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Nessuna impostazione"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Tutti gli utenti"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Gruppi"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Utenti"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Elimina"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificato principale per SSL"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importa certificato principale"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Abilita la memoria esterna dell'utente"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Consente agli utenti di montare la propria memoria esterna"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index c2b3f0f95af..c2e3c68a493 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 07:12+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "I tuoi file condivisi"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Elemento"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "Condiviso con"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Permessi"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Lettura"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Modifica"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Eliminazione"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Abilita ri-condivisione"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Consenti agli utenti di ri-condividere i file di cui non sono proprietari"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 3f6bd1465a7..54f176fb2e3 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:12+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Scadenza di tutte le versioni"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Abilita controllo di versione"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b09274cf358..b2d4c88847a 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:44+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"
@@ -82,15 +82,15 @@ msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "esegui un'attività con ogni pagina caricata"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php è registrato a un servizio webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "usa il servizio cron di sistema"
#: templates/admin.php:39
msgid "Log"
@@ -233,8 +233,8 @@ msgid "Other"
msgstr "Altro"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr "Gruppo di amministrazione"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/it/tasks.po b/l10n/it/tasks.po
index 130a092b66f..6e5f07a0873 100644
--- a/l10n/it/tasks.po
+++ b/l10n/it/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 06:00+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"
@@ -19,88 +20,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Ora/Data non valida"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Attività"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Nessuna categoria"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Non specificata"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=massima"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=media"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=minima"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Riepilogo vuoto"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Percentuale di completamento non valida"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Priorità non valida"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Aggiungi attività"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Ordina per scadenza"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Ordina per elenco"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Ordina per completamento"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Ordina per posizione"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Ordina per priorità"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Ordina per etichetta"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Caricamento attività in corso..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Importante"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Più"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Meno"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Elimina"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index a1480258863..cfd6cf566ee 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
+# Vincenzo Reale <vinx.reale@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 14:56+0000\n"
+"Last-Translator: Innocenzo Ventre <el.diabl09@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"
@@ -19,146 +21,146 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Host"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "DN base"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "DN utente"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "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
msgid "Password"
-msgstr ""
+msgstr "Password"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filtro per il login utente"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Specifica quale filtro utilizzare quando si tenta il login. %%uid sostituisce il nome utente all'atto del login."
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "utilizza il segnaposto %%uid, per esempio \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filtro per la lista utente"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Filtro per il gruppo"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Porta"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Struttura base dell'utente"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Struttura base del gruppo"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "Associazione gruppo-utente "
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Usa TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Non utilizzare per le connessioni SSL, fallirà."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Case insensitve LDAP server (Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Disattiva il controllo del certificato SSL."
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Non consigliato, utilizzare solo per test."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Campo per la visualizzazione del nome utente"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Campo per la visualizzazione del nome del gruppo"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "in byte"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "in secondi. Il cambio svuota la cache."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Aiuto"
diff --git a/l10n/it/user_migrate.po b/l10n/it/user_migrate.po
index 2600696b79e..9c918e027c5 100644
--- a/l10n/it/user_migrate.po
+++ b/l10n/it/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:55+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"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Esporta"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Si è verificato un errore durante la creazione del file di esportazione"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Si è verificato un errore"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Esporta il tuo account utente"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Questa operazione creerà un file compresso che contiene il tuo account ownCloud."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Importa account utente"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip account utente"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Importa"
diff --git a/l10n/it/user_openid.po b/l10n/it/user_openid.po
index 37d859ae351..b769535161e 100644
--- a/l10n/it/user_openid.po
+++ b/l10n/it/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Vincenzo Reale <vinx.reale@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 11:46+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Questo è un server OpenID. Per ulteriori informazioni, vedi"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identità: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Dominio: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Utente: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Accesso"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Errore: <b>nessun utente selezionato"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "puoi autenticarti ad altri siti con questo indirizzo"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Fornitore OpenID autorizzato"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Il tuo indirizzo su Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/ja_JP/admin_dependencies_chk.po b/l10n/ja_JP/admin_dependencies_chk.po
index 1d928c91bdf..be8f217eba1 100644
--- a/l10n/ja_JP/admin_dependencies_chk.po
+++ b/l10n/ja_JP/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 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-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:08+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "php-jsonモジュールはアプリケーション間の内部通信に必要です"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "php-curlモジュールはブックマーク追加時のページタイトル取得に必要です"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "php-gdモジュールはサムネイル画像の生成に必要です"
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "php-ldapモジュールはLDAPサーバへの接続に必要です"
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "php-zipモジュールは複数ファイルの同時ダウンロードに必要です"
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "php-mb_multibyteモジュールはエンコードを正しく扱うために必要です"
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "php-ctypeモジュールはデータのバリデーションに必要です"
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "php-xmlモジュールはWebDAVでのファイル共有に必要です"
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "php.iniのallow_url_fopenはOCSサーバから知識ベースを取得するために1に設定しなくてはなりません"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "php-pdoモジュールはデータベースにownCloudのデータを格納するために必要です"
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "依存関係の状況"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "利用先 :"
diff --git a/l10n/ja_JP/admin_migrate.po b/l10n/ja_JP/admin_migrate.po
index b0603a4f42b..4411d9e77cd 100644
--- a/l10n/ja_JP/admin_migrate.po
+++ b/l10n/ja_JP/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:29+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "ownCloudをエクスポート"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "このownCloudのデータを含む圧縮ファイルを生成します。\nエクスポートの種類を選択してください:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "エクスポート"
diff --git a/l10n/ja_JP/calendar.po b/l10n/ja_JP/calendar.po
index 90254140d20..c62d4af4541 100644
--- a/l10n/ja_JP/calendar.po
+++ b/l10n/ja_JP/calendar.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 01:51+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -159,7 +160,7 @@ msgstr "週の始まり"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "による"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -477,7 +478,7 @@ msgstr "今日"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "設定"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -731,7 +732,7 @@ msgstr "at"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "一般"
#: templates/settings.php:15
msgid "Timezone"
@@ -739,11 +740,11 @@ msgstr "タイムゾーン"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "自動的にタイムゾーンを更新"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "時刻の表示形式"
#: templates/settings.php:57
msgid "24h"
@@ -755,7 +756,7 @@ msgstr "12h"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "1週間の初めの曜日"
#: templates/settings.php:76
msgid "Cache"
@@ -767,7 +768,7 @@ msgstr "イベントを繰り返すためにキャッシュをクリアしてく
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URL"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1643d768f3a..8e753c62e43 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 04:45+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
msgid "Error (de)activating addressbook."
-msgstr "アドレスブックの有効/無効化に失敗しました。"
+msgstr "アドレス帳の有効/無効化に失敗しました。"
#: ajax/addressbook/delete.php:31 ajax/addressbook/update.php:20
#: ajax/contact/addproperty.php:42 ajax/contact/delete.php:31
@@ -30,11 +31,11 @@ msgstr "idが設定されていません。"
#: ajax/addressbook/update.php:24
msgid "Cannot update addressbook with an empty name."
-msgstr "空白の名前でアドレスブックを更新することはできません。"
+msgstr "空白の名前でアドレス帳を更新することはできません。"
#: ajax/addressbook/update.php:28
msgid "Error updating addressbook."
-msgstr "アドレスブックの更新に失敗しました。"
+msgstr "アドレス帳の更新に失敗しました。"
#: ajax/categories/categoriesfor.php:17
msgid "No ID provided"
@@ -50,7 +51,7 @@ msgstr "削除するカテゴリが選択されていません。"
#: ajax/categories/delete.php:26
msgid "No address books found."
-msgstr "アドレスブックが見つかりません。"
+msgstr "アドレス帳が見つかりません。"
#: ajax/categories/delete.php:34
msgid "No contacts found."
@@ -240,8 +241,8 @@ msgstr "有効なアドレスを取得できませんでした。"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "エラー"
@@ -275,7 +276,7 @@ msgstr "アップロードしようとしているファイルは、このサー
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "プロファイルの画像の読み込みエラー"
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -285,7 +286,11 @@ msgstr "タイプを選択"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
-msgstr ""
+msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "これらのアドレス帳をマージしてもよろしいですか?"
#: js/loader.js:49
msgid "Result: "
@@ -305,7 +310,7 @@ msgstr "表示名は空にできません。"
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr "連絡先が見つかりません:"
+msgstr "アドレス帳が見つかりません:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -451,7 +456,7 @@ msgstr "設定"
#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
-msgstr "電話帳"
+msgstr "アドレス帳"
#: templates/index.php:36 templates/part.import.php:24
msgid "Close"
@@ -475,15 +480,15 @@ msgstr "リスト内の前のコンタクト"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
-msgstr "現在の連絡帳を展開する/折りたたむ"
+msgstr "現在のアドレス帳を展開する/折りたたむ"
#: templates/index.php:48
msgid "Next addressbook"
-msgstr "次の連絡先"
+msgstr "次のアドレス帳"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr "前の連絡先"
+msgstr "前のアドレス帳"
#: templates/index.php:54
msgid "Actions"
@@ -499,7 +504,7 @@ msgstr "新しいコンタクトを追加"
#: templates/index.php:61
msgid "Add new addressbook"
-msgstr "新しいアドレスブックを追加"
+msgstr "新しいアドレス帳を追加"
#: templates/index.php:63
msgid "Delete current contact"
@@ -527,7 +532,7 @@ msgstr "ownCloudから写真を選択"
#: templates/part.contact.php:35
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順"
#: templates/part.contact.php:36
msgid "Edit name details"
@@ -581,7 +586,7 @@ msgstr "推奨"
#: templates/part.contact.php:64
msgid "Please specify a valid email address."
-msgstr "連絡先を追加"
+msgstr "有効なメールアドレスを指定してください。"
#: templates/part.contact.php:64
msgid "Enter email address"
@@ -696,11 +701,11 @@ msgstr "国名"
#: templates/part.edit_name_dialog.php:16
msgid "Addressbook"
-msgstr "アドレスブック"
+msgstr "アドレス帳"
#: templates/part.edit_name_dialog.php:23
msgid "Hon. prefixes"
-msgstr ""
+msgstr "敬称"
#: templates/part.edit_name_dialog.php:27
msgid "Miss"
@@ -740,7 +745,7 @@ msgstr "姓"
#: templates/part.edit_name_dialog.php:41
msgid "Hon. suffixes"
-msgstr "ストレージへの連絡先のアップロードエラー。"
+msgstr "称号"
#: templates/part.edit_name_dialog.php:45
msgid "J.D."
@@ -780,11 +785,11 @@ msgstr "コンタクトファイルをインポート"
#: templates/part.import.php:6
msgid "Please choose the addressbook"
-msgstr "アドレスブックを選択してください"
+msgstr "アドレス帳を選択してください"
#: templates/part.import.php:10
msgid "create a new addressbook"
-msgstr "新しいアドレスブックを作成"
+msgstr "新しいアドレス帳を作成"
#: templates/part.import.php:15
msgid "Name of new addressbook"
@@ -796,7 +801,7 @@ msgstr "コンタクトをインポート"
#: templates/part.no_contacts.php:3
msgid "You have no contacts in your addressbook."
-msgstr "アドレスブックに連絡先が登録されていません。"
+msgstr "アドレス帳に連絡先が登録されていません。"
#: templates/part.no_contacts.php:5
msgid "Add contact"
@@ -808,13 +813,13 @@ msgstr "アドレス帳を設定"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr "連絡先を洗濯してください"
+msgstr "アドレス帳を選択してください"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "名前を入力"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "説明を入力してください"
@@ -852,7 +857,7 @@ msgstr "編集"
#: templates/settings.php:40
msgid "New Address Book"
-msgstr "新規電話帳"
+msgstr "新規のアドレス帳"
#: templates/settings.php:41
msgid "Name"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 5cf8f5a4c07..c9941a81c9c 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 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-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:43+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "暗号化"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "暗号化から除外するファイルタイプ"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "なし"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "暗号化を有効にする"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 6096d9408f5..1de6cdac432 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:46+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "外部ストレージ"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "マウントポイント"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "バックエンド"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "設定"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "オプション"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "適用範囲"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "マウントポイントを追加"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "未設定"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "すべてのユーザ"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "グループ"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "ユーザ"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "削除"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSLルート証明書"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "ルート証明書をインポート"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "ユーザの外部ストレージを有効にする"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "ユーザに外部ストレージのマウントを許可する"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index fcadb4bdc9f..fb178df41c5 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:58+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +21,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "共有ファイル"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "項目"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "で共有 "
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "許可"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "読込"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "編集"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "削除"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "再共有を有効にする"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "所有者でないファイルの共有を許可する"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index e61c39bff46..893e07db20b 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 02:41+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "すべてのバージョンを削除する"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "ファイルのバージョン管理を有効にする"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 79aec21152a..8912c42577b 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -72,19 +73,19 @@ msgstr "セキュリティ警告"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "cron(自動定期実行)"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ページを開く毎にタスクを1つ実行"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.phpをwebcronサービスに登録しました"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "システムのcronサービスを使用"
#: templates/admin.php:39
msgid "Log"
@@ -227,8 +228,8 @@ msgid "Other"
msgstr "その他"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "サブ管理者"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/ja_JP/tasks.po b/l10n/ja_JP/tasks.po
index fdd063c3ca0..13b0423ca16 100644
--- a/l10n/ja_JP/tasks.po
+++ b/l10n/ja_JP/tasks.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 03:40+0000\n"
+"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +21,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "無効な日付/時刻"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "タスク"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "カテゴリ無し"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "未指定"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=高"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=中"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=低"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "要旨が未記入"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "進捗%が不正"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "無効な優先度"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "タスクを追加"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "期日で並べ替え"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "リストで並び替え"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "完了で並べ替え"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "場所で並べ替え"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "優先度で並べ替え"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "ラベルで並べ替え"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "タスクをロード中..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "重要"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "詳細"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "閉じる"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "削除"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index d19e9c5dd83..5c22b913b44 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:33+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,146 +21,146 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "ホスト"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "ベースDN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "ユーザDN"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "パスワード"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "ユーザログインフィルタ"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "ユーザリストフィルタ"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "グループフィルタ"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "グループを取得するときに適用するフィルターを定義する。"
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "ポート"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "ベースユーザツリー"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "ベースグループツリー"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "グループとメンバーの関連付け"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "TLSを利用"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "SSL接続に利用しないでください、失敗します。"
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "大文字/小文字を区別しないLDAPサーバ(Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "SSL証明書の確認を無効にする。"
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "推奨しません、テスト目的でのみ利用してください。"
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "ユーザ表示名のフィールド"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "グループ表示名のフィールド"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "グループのownCloud名の生成に利用するLDAP属性。"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "バイト"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "秒。変更後にキャッシュがクリアされます。"
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "ヘルプ"
diff --git a/l10n/ja_JP/user_migrate.po b/l10n/ja_JP/user_migrate.po
index 04d95df0be9..71b2c612ed6 100644
--- a/l10n/ja_JP/user_migrate.po
+++ b/l10n/ja_JP/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 05:28+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "エクスポート"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "エクスポートファイルの生成時に何か不具合が発生しました。"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "エラーが発生しました"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "ユーザアカウントのエクスポート"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "あなたのownCloudアカウントを含む圧縮ファイルを生成します。"
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "ユーザアカウントをインポート"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ownCloudユーザZip"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "インポート"
diff --git a/l10n/ja_JP/user_openid.po b/l10n/ja_JP/user_openid.po
index 877dc59cdf1..5fe4094e683 100644
--- a/l10n/ja_JP/user_openid.po
+++ b/l10n/ja_JP/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 06:36+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "これはOpenIDサーバのエンドポイントです。詳細は下記をチェックしてください。"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "識別子: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "レルム: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "ユーザ: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "ログイン"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "エラー: <b>ユーザが選択されていません"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "他のサイトにこのアドレスで認証することができます"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "認証されたOpenIDプロバイダ"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Wordpressのアドレス、Identi.ca、&hellip;"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 5ade5e1187e..2854ac20650 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "유효한 주소를 얻을 수 없습니다."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "오류"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "결과:"
@@ -811,11 +815,11 @@ msgstr "주소록 구성"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index ad845081a52..a4bfa5dacae 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "다른"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index e2d248e4536..472a09280ca 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fehler"
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat: "
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 55306588cc7..6b1e939e537 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr "Aner"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 04921869c84..8f89a727561 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index b4e462f1d03..203e186cc54 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr "Kita"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 18a053d1297..f9b6c5143e3 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 64a7220d645..725d9531266 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr "Cits"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 421574eb07d..50c48cac5c9 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr "Не можев да добијам исправна адреса."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Грешка"
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Резултат: "
@@ -811,11 +815,11 @@ msgstr "Уреди адресари"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 384ec05fd83..6fd5df90dcc 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Останато"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index a5435b96a5e..625f969556d 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr "Tidak boleh mendapat alamat yang sah."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Ralat"
@@ -291,6 +291,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Hasil: "
@@ -814,11 +818,11 @@ msgstr "Konfigurasi buku alamat"
msgid "Select Address Books"
msgstr "Pilih Buku Alamat"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Masukkan nama"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Masukkan keterangan"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 4caf358d9bf..07857601beb 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -230,8 +230,8 @@ msgid "Other"
msgstr "Lain"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index ea159661fe3..9472cf35d17 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Feil"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -813,11 +817,11 @@ msgstr "Konfigurer adressebøker"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 51ea270fd48..551c484ea51 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -231,7 +231,7 @@ msgid "Other"
msgstr "Annet"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index 695acef5f6a..b2c16170f6d 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -244,8 +244,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -291,6 +291,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -814,11 +818,11 @@ msgstr "Bewerken adresboeken"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index b056a1747bb..15427dff1bc 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -232,7 +232,7 @@ msgid "Other"
msgstr "Andere"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index e9742c79bc7..a3933bcc26c 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index e9d4c7ed3e5..3b138e17dd1 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 04c9ce97a2e..598cdb30afd 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -243,8 +243,8 @@ msgstr "Nie można pobrać prawidłowego adresu."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Błąd"
@@ -290,6 +290,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Wynik: "
@@ -813,11 +817,11 @@ msgstr "Konfiguruj książkę adresową"
msgid "Select Address Books"
msgstr "Wybierz książki adresowe"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Wpisz nazwę"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Wprowadź opis"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index a3c4bafc1db..d46730dafdd 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nie mogę załadować listy aplikacji"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -54,7 +54,7 @@ msgstr "Język zmieniony"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Błąd"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -78,7 +78,7 @@ msgstr "Ostrzeżenia bezpieczeństwa"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
@@ -233,8 +233,8 @@ msgid "Other"
msgstr "Inne"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "SubAdmin"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index e0aa5a97bd4..650f1c397f0 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Não foi possível obter um endereço válido."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado:"
@@ -812,11 +816,11 @@ msgstr "Configurar agenda de endereços"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9900cd19029..333a52a86e3 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -231,7 +231,7 @@ msgid "Other"
msgstr "Outro"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 964dae21963..6523b65a6c7 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Não foi possível obter um endereço válido."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Erro"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultado: "
@@ -812,11 +816,11 @@ msgstr "Configurar livros de endereços"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index db32bde84e1..a7fab8357c9 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Outro"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 0881e6a3b59..e3d9e31c1ea 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -812,11 +816,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 5b756571024..736ab30fa14 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +230,7 @@ msgid "Other"
msgstr "Altele"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/ro/tasks.po b/l10n/ro/tasks.po
index a49bdb61fa3..c7869fb6c68 100644
--- a/l10n/ro/tasks.po
+++ b/l10n/ro/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dumitru Ursu <>, 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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:30+0000\n"
+"Last-Translator: Dumitru Ursu <>\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"
@@ -19,88 +20,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Data/timpul invalid"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Sarcini"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Fără categorie"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Nespecificat"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=cel mai înalt"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=mediu"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=cel mai jos"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Rezumat gol"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Completare procentuală greșită"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Prioritare greșită"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Adaugă sarcină"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "Comandă până la"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "Lista de comenzi"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "Comandă executată"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "Locația comenzii"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "Prioritarea comenzii"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "Eticheta comenzii"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Încărcare sarcini"
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Important"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Mai mult"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Mai puțin"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Șterge"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index f9aaaa9fb0a..644c43d43de 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dumitru Ursu <>, 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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 20:24+0000\n"
+"Last-Translator: Dumitru Ursu <>\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"
@@ -19,146 +20,146 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Gazdă"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "DN de bază"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "DN al utilizatorului"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "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
msgid "Password"
-msgstr ""
+msgstr "Parolă"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filtrare după Nume Utilizator"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filtrarea după lista utilizatorilor"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "fără substituenți, d.e. \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Fitrare Grup"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definește filtrele care se aplică, când se preiau grupurile."
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Portul"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Arborele de bază al Utilizatorilor"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Arborele de bază al Grupurilor"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "Asocierea Grup-Membru"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Utilizează TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Server LDAP insensibil la majuscule (Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Oprește validarea certificatelor SSL "
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Nu este recomandat, a se utiliza doar pentru testare."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Câmpul cu numele vizibil al utilizatorului"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Câmpul cu numele grupului"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "în octeți"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "în secunde. O schimbare curăță memoria tampon."
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Ajutor"
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index 33e20b02e3f..3b4d2ffe82d 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -6,15 +6,16 @@
# Denis <reg.transifex.net@demitel.ru>, 2012.
# <jekader@gmail.com>, 2011, 2012.
# Nick Remeslennikov <homolibere@gmail.com>, 2012.
+# <rasperepodvipodvert@gmail.com>, 2012.
# <tony.mccourin@gmail.com>, 2011.
# Victor Bravo <>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 17:21+0000\n"
+"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@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"
@@ -163,7 +164,7 @@ msgstr "Работа"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "до свидания"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -481,7 +482,7 @@ msgstr "Сегодня"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "Параметры"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -697,13 +698,13 @@ msgstr "Название нового календаря"
#: templates/part.import.php:44
msgid "Take an available name!"
-msgstr ""
+msgstr "Возьмите разрешенное имя!"
#: templates/part.import.php:45
msgid ""
"A Calendar with this name already exists. If you continue anyhow, these "
"calendars will be merged."
-msgstr ""
+msgstr "Календарь с таким именем уже существует. Если вы продолжите, одноименный календарь будет удален."
#: templates/part.import.php:47
msgid "Import"
@@ -735,7 +736,7 @@ msgstr "на"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "Основные"
#: templates/settings.php:15
msgid "Timezone"
@@ -743,11 +744,11 @@ msgstr "Часовой пояс"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "Автоматическое обновление временной зоны"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "Формат времени"
#: templates/settings.php:57
msgid "24h"
@@ -759,23 +760,23 @@ msgstr "12ч"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "Начало недели"
#: templates/settings.php:76
msgid "Cache"
-msgstr ""
+msgstr "Кэш"
#: templates/settings.php:80
msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Очистить кэш повторяющихся событий"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Адрес синхронизации CalDAV"
#: templates/settings.php:87
msgid "more info"
@@ -783,15 +784,15 @@ msgstr "подробнее"
#: templates/settings.php:89
msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Основной адрес (Контакта)"
#: templates/settings.php:91
msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
#: templates/settings.php:93
msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "Читать только ссылки iCalendar"
#: templates/share.dropdown.php:20
msgid "Users"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index 4c7214c485c..a38d426bf55 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -246,8 +246,8 @@ msgstr "Не удалось получить адрес."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Ошибка"
@@ -293,6 +293,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Результат:"
@@ -816,11 +820,11 @@ msgstr "Настроить адресную книгу"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 80974641894..8dfb19bb77b 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,15 +8,16 @@
# <jekader@gmail.com>, 2012.
# <lankme@gmail.com>, 2012.
# Nick Remeslennikov <homolibere@gmail.com>, 2012.
+# <rasperepodvipodvert@gmail.com>, 2012.
# <tony.mccourin@gmail.com>, 2011.
# Victor Bravo <>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 11:59+0000\n"
+"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@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"
@@ -26,7 +27,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Загрузка из App Store запрещена"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -54,7 +55,7 @@ msgstr "Язык изменён"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Ошибка"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -78,19 +79,19 @@ msgstr "Предупреждение безопасности"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Задание"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Запускать задание при загрузке каждой страницы"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php зарегистрирован в webcron сервисе"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "использовать системные задания"
#: templates/admin.php:39
msgid "Log"
@@ -233,8 +234,8 @@ msgid "Other"
msgstr "Другое"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr ""
+msgid "Group Admin"
+msgstr "Группа Администраторы"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index ef45c76a922..c80dd487697 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Nemôžem získať platnú adresu."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Chyba"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Výsledok: "
@@ -812,11 +816,11 @@ msgstr "Nastaviť adresáre"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Zadaj meno"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index ed5268ef8b0..8184b873557 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -229,7 +229,7 @@ msgid "Other"
msgstr "Iné"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/sl/admin_dependencies_chk.po b/l10n/sl/admin_dependencies_chk.po
index 0dc34327997..f60a8e1d14f 100644
--- a/l10n/sl/admin_dependencies_chk.po
+++ b/l10n/sl/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 20:55+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"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "Modul php-json je potreben za medsebojno komunikacijo veliko aplikacij."
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "Modul php-curl je potreben za pridobivanje naslova strani pri dodajanju zaznamkov."
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Modul php-gd je potreben za ustvarjanje sličic za predogled."
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Modul php-ldap je potreben za povezavo z vašim ldap strežnikom."
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Modul php-zip je potreben za prenašanje večih datotek hkrati."
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Modul php-mb_multibyte je potreben za pravilno upravljanje kodiranja."
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Modul php-ctype je potreben za preverjanje veljavnosti podatkov."
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Modul php-xml je potreben za izmenjavo datotek preko protokola WebDAV."
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "Direktiva allow_url_fopen v vaši php.ini datoteki mora biti nastavljena na 1, če želite omogočiti dostop do zbirke znanja na strežnikih OCS."
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Modul php-pdo je potreben za shranjevanje ownCloud podatkov v podatkovno zbirko."
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "Stanje odvisnosti"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "Uporablja:"
diff --git a/l10n/sl/admin_migrate.po b/l10n/sl/admin_migrate.po
index e4aec295fb2..5a600890b71 100644
--- a/l10n/sl/admin_migrate.po
+++ b/l10n/sl/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:17+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"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Izvozi to ownCloud namestitev"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "Ustvarjena bo stisnjena datoteka s podatki te ownCloud namestitve.\n Prosimo, če izberete vrsto izvoza:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "Izvozi"
diff --git a/l10n/sl/calendar.po b/l10n/sl/calendar.po
index b1792961b60..8d2ba48009e 100644
--- a/l10n/sl/calendar.po
+++ b/l10n/sl/calendar.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 13:25+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"
@@ -23,11 +23,11 @@ msgstr ""
#: ajax/cache/status.php:19
msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Vsi koledarji niso povsem predpomnjeni"
#: ajax/cache/status.php:21
msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Izgleda, da je vse v predpomnilniku"
#: ajax/categories/rescan.php:29
msgid "No calendars found."
@@ -45,19 +45,19 @@ msgstr "Napačen koledar"
msgid ""
"The file contained either no events or all events are already saved in your "
"calendar."
-msgstr ""
+msgstr "Datoteka ni vsebovala dogodkov ali pa so vsi dogodki že shranjeni v koledarju."
#: ajax/import/dropimport.php:31 ajax/import/import.php:67
msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "dogodki so bili shranjeni v nov koledar"
#: ajax/import/import.php:56
msgid "Import failed"
-msgstr ""
+msgstr "Uvoz je spodletel"
#: ajax/import/import.php:69
msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "dogodki so bili shranjeni v vaš koledar"
#: ajax/settings/guesstimezone.php:25
msgid "New Timezone:"
@@ -162,7 +162,7 @@ msgstr "Delo"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "od"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -351,79 +351,79 @@ msgstr "Kol."
#: templates/calendar.php:6
msgid "Sun."
-msgstr ""
+msgstr "ned."
#: templates/calendar.php:6
msgid "Mon."
-msgstr ""
+msgstr "pon."
#: templates/calendar.php:6
msgid "Tue."
-msgstr ""
+msgstr "tor."
#: templates/calendar.php:6
msgid "Wed."
-msgstr ""
+msgstr "sre."
#: templates/calendar.php:6
msgid "Thu."
-msgstr ""
+msgstr "čet."
#: templates/calendar.php:6
msgid "Fri."
-msgstr ""
+msgstr "pet."
#: templates/calendar.php:6
msgid "Sat."
-msgstr ""
+msgstr "sob."
#: templates/calendar.php:8
msgid "Jan."
-msgstr ""
+msgstr "jan."
#: templates/calendar.php:8
msgid "Feb."
-msgstr ""
+msgstr "feb."
#: templates/calendar.php:8
msgid "Mar."
-msgstr ""
+msgstr "mar."
#: templates/calendar.php:8
msgid "Apr."
-msgstr ""
+msgstr "apr."
#: templates/calendar.php:8
msgid "May."
-msgstr ""
+msgstr "maj"
#: templates/calendar.php:8
msgid "Jun."
-msgstr ""
+msgstr "jun."
#: templates/calendar.php:8
msgid "Jul."
-msgstr ""
+msgstr "jul."
#: templates/calendar.php:8
msgid "Aug."
-msgstr ""
+msgstr "avg."
#: templates/calendar.php:8
msgid "Sep."
-msgstr ""
+msgstr "sep."
#: templates/calendar.php:8
msgid "Oct."
-msgstr ""
+msgstr "okt."
#: templates/calendar.php:8
msgid "Nov."
-msgstr ""
+msgstr "nov."
#: templates/calendar.php:8
msgid "Dec."
-msgstr ""
+msgstr "dec."
#: templates/calendar.php:11
msgid "All day"
@@ -480,7 +480,7 @@ msgstr "Danes"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -688,7 +688,7 @@ msgstr "Uvozi datoteko koledarja"
#: templates/part.import.php:24
msgid "Please choose a calendar"
-msgstr ""
+msgstr "Prosimo, če izberete koledar"
#: templates/part.import.php:36
msgid "Name of new calendar"
@@ -696,13 +696,13 @@ msgstr "Ime novega koledarja"
#: templates/part.import.php:44
msgid "Take an available name!"
-msgstr ""
+msgstr "Izberite prosto ime!"
#: templates/part.import.php:45
msgid ""
"A Calendar with this name already exists. If you continue anyhow, these "
"calendars will be merged."
-msgstr ""
+msgstr "Koledar s tem imenom že obstaja. Če nadaljujete, bosta koledarja združena."
#: templates/part.import.php:47
msgid "Import"
@@ -734,7 +734,7 @@ msgstr "pri"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "Splošno"
#: templates/settings.php:15
msgid "Timezone"
@@ -742,11 +742,11 @@ msgstr "Časovni pas"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "Samodejno posodobi časovni pas"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "Oblika zapisa časa"
#: templates/settings.php:57
msgid "24h"
@@ -758,39 +758,39 @@ msgstr "12ur"
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "Začni teden z"
#: templates/settings.php:76
msgid "Cache"
-msgstr ""
+msgstr "Predpomnilnik"
#: templates/settings.php:80
msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Počisti predpomnilnik za ponavljajoče dogodke"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLji"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "CalDAV naslov za usklajevanje koledarjev"
#: templates/settings.php:87
msgid "more info"
-msgstr ""
+msgstr "dodatne informacije"
#: templates/settings.php:89
msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Glavni naslov (Kontakt et al)"
#: templates/settings.php:91
msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
#: templates/settings.php:93
msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "iCalendar povezava/e samo za branje"
#: templates/share.dropdown.php:20
msgid "Users"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 765e127a418..3bfd97ff7c3 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-17 00:44+0200\n"
+"PO-Revision-Date: 2012-08-16 20:56+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"
@@ -68,7 +68,7 @@ msgstr "ime elementa ni nastavljeno."
#: ajax/contact/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "Ne morem razčleniti stika:"
#: ajax/contact/addproperty.php:56
msgid "Cannot add empty property."
@@ -84,7 +84,7 @@ msgstr "Poskušam dodati podvojeno lastnost:"
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "Napaka pri dodajanju lastnosti stiku:"
#: ajax/contact/deleteproperty.php:37
msgid "Information about vCard is incorrect. Please reload the page."
@@ -242,8 +242,8 @@ msgstr "Ne morem dobiti veljavnega naslova."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Napaka"
@@ -277,7 +277,7 @@ msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno veliko
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Napaka pri nalaganju slike profila."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -287,7 +287,11 @@ msgstr "Izberite vrsto"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
-msgstr ""
+msgstr "Nekateri stiki so označeni za izbris, vendar še niso izbrisani. Prosimo, če počakate na njihov izbris."
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "Ali želite združiti adresarje?"
#: js/loader.js:49
msgid "Result: "
@@ -303,11 +307,11 @@ msgstr " je spodletelo."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Ime za prikaz ne more biti prazno."
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresar ni bil najden:"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -381,55 +385,55 @@ msgstr "Rojstni dan"
#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "Poslovno"
#: lib/app.php:185
msgid "Call"
-msgstr ""
+msgstr "Klic"
#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "Stranka"
#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "Dostavljalec"
#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "Prazniki"
#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "Ideje"
#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "Potovanje"
#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "Jubilej"
#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "Sestanek"
#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "Drugo"
#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "Osebno"
#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "Projekti"
#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "Vprašanja"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -449,7 +453,7 @@ msgstr "Uvozi"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "Nastavitve"
#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
@@ -461,51 +465,51 @@ msgstr "Zapri"
#: templates/index.php:37
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Bližnjice na tipkovnici"
#: templates/index.php:39
msgid "Navigation"
-msgstr ""
+msgstr "Krmarjenje"
#: templates/index.php:42
msgid "Next contact in list"
-msgstr ""
+msgstr "Naslednji stik na seznamu"
#: templates/index.php:44
msgid "Previous contact in list"
-msgstr ""
+msgstr "Predhodni stik na seznamu"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Razširi/skrči trenutni adresar"
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "Naslednji adresar"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "Predhodni adresar"
#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "Dejanja"
#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "Osveži seznam stikov"
#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "Dodaj nov stik"
#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "Dodaj nov adresar"
#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
+msgstr "Izbriši trenutni stik"
#: templates/part.contact.php:17
msgid "Drop photo to upload"
@@ -551,15 +555,15 @@ msgstr "Vnesite vzdevek"
#: templates/part.contact.php:43 templates/part.contact.php:119
msgid "Web site"
-msgstr ""
+msgstr "Spletna stran"
#: templates/part.contact.php:44
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.nekastran.si"
#: templates/part.contact.php:44
msgid "Go to web site"
-msgstr ""
+msgstr "Pojdi na spletno stran"
#: templates/part.contact.php:46
msgid "dd-mm-yyyy"
@@ -656,11 +660,11 @@ msgstr "Poštni predal"
#: templates/part.edit_address_dialog.php:24
msgid "Street address"
-msgstr ""
+msgstr "Ulični naslov"
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "Ulica in štelika"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -668,7 +672,7 @@ msgstr "Razširjeno"
#: templates/part.edit_address_dialog.php:33
msgid "Apartment number etc."
-msgstr ""
+msgstr "Številka stanovanja itd."
#: templates/part.edit_address_dialog.php:36
#: templates/part.edit_address_dialog.php:39
@@ -681,7 +685,7 @@ msgstr "Regija"
#: templates/part.edit_address_dialog.php:45
msgid "E.g. state or province"
-msgstr ""
+msgstr "Npr. dežela ali pokrajina"
#: templates/part.edit_address_dialog.php:48
msgid "Zipcode"
@@ -689,7 +693,7 @@ msgstr "Poštna št."
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "Poštna številka"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -810,15 +814,15 @@ msgstr "Nastavi imenike"
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "Izberite adresarje"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
-msgstr ""
+msgstr "Vnesite ime"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
-msgstr ""
+msgstr "Vnesite opis"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -838,11 +842,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "Pokaži CardDav povezavo"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Pokaži VCF povezavo samo za branje"
#: templates/settings.php:26
msgid "Download"
@@ -858,11 +862,11 @@ msgstr "Nov imenik"
#: templates/settings.php:41
msgid "Name"
-msgstr ""
+msgstr "Ime"
#: templates/settings.php:42
msgid "Description"
-msgstr ""
+msgstr "Opis"
#: templates/settings.php:43
msgid "Save"
@@ -874,4 +878,4 @@ msgstr "Prekliči"
#: templates/settings.php:49
msgid "More..."
-msgstr ""
+msgstr "Več..."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 27019afd797..4fa6cd3746f 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:04+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"
@@ -64,23 +64,23 @@ msgstr "Izbriši"
#: js/filelist.js:141
msgid "already exists"
-msgstr ""
+msgstr "že obstaja"
#: js/filelist.js:141
msgid "replace"
-msgstr ""
+msgstr "nadomesti"
#: js/filelist.js:141
msgid "cancel"
-msgstr ""
+msgstr "ekliči"
#: js/filelist.js:195
msgid "replaced"
-msgstr ""
+msgstr "nadomeščen"
#: js/filelist.js:195
msgid "with"
-msgstr ""
+msgstr "z"
#: js/filelist.js:195 js/filelist.js:256
msgid "undo"
@@ -114,27 +114,27 @@ msgstr "Nalaganje je bilo preklicano."
msgid "Invalid name, '/' is not allowed."
msgstr "Neveljavno ime. Znak '/' ni dovoljen."
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
msgid "Size"
msgstr "Velikost"
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
msgid "Modified"
msgstr "Spremenjeno"
-#: js/files.js:659
+#: js/files.js:722
msgid "folder"
msgstr "mapa"
-#: js/files.js:661
+#: js/files.js:724
msgid "folders"
msgstr "mape"
-#: js/files.js:669
+#: js/files.js:732
msgid "file"
msgstr "datoteka"
-#: js/files.js:671
+#: js/files.js:734
msgid "files"
msgstr "datoteke"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index ee97cf3b746..294eea91d13 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:19+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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Šifriranje"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Naslednje vrste datotek naj se ne šifrirajo"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Brez"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Omogoči šifriranje"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 1435977b9ae..19d395b99dd 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:14+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"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Zunanja podatkovna shramba"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Priklopna točka"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Zaledje"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Nastavitve"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Možnosti"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Se uporablja"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Dodaj priklopno točko"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Ni nastavljeno"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Vsi uporabniki"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Skupine"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Uporabniki"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Izbriši"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL korenski certifikati"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Uvozi korenski certifikat"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index d50a6214c92..e6928f35fac 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:59+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"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "Vaše datoteke v souporabi"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "Predmet"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "V souporabi z"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "Dovoljenja"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "Branje"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "Pisanje"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "Izbris"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "Omogoči nadaljnjo izmenjavo"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "Dovoli uporabnikom nadaljnjo izmenjavo tujih datotek"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 29a2310e260..5e6bbbb4859 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:25+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"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "Zastaraj vse različice"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Omogoči sledenje različicam datotek"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index fb1e393186d..305737e78c5 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.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-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 02:09+0000\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00:37+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"
@@ -18,27 +18,27 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
-#: app.php:287
+#: app.php:288
msgid "Help"
msgstr "Pomoč"
-#: app.php:294
+#: app.php:295
msgid "Personal"
msgstr "Osebno"
-#: app.php:299
+#: app.php:300
msgid "Settings"
msgstr "Nastavitve"
-#: app.php:304
+#: app.php:305
msgid "Users"
msgstr "Uporabniki"
-#: app.php:311
+#: app.php:312
msgid "Apps"
msgstr "Aplikacije"
-#: app.php:313
+#: app.php:314
msgid "Admin"
msgstr "Skrbnik"
@@ -72,7 +72,7 @@ msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
#: template.php:86
msgid "seconds ago"
-msgstr ""
+msgstr "sekundami"
#: template.php:87
msgid "1 minute ago"
@@ -102,7 +102,7 @@ msgstr "prejšnji mesec"
#: template.php:95
msgid "months ago"
-msgstr ""
+msgstr "meseci"
#: template.php:96
msgid "last year"
@@ -110,4 +110,4 @@ msgstr "lani"
#: template.php:97
msgid "years ago"
-msgstr ""
+msgstr "leti"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2e94a971bac..32ff133a37f 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 13:08+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"
@@ -22,7 +22,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ne morem naložiti seznama iz App Store"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -50,7 +50,7 @@ msgstr "Jezik je bil spremenjen"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "Napaka"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -74,19 +74,19 @@ msgstr "Varnostno opozorilo"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Periodično opravilo"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "izvedi eno nalogo z vsako naloženo stranjo"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je vpisan na storitev webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "uporabi sistemski servis za periodična opravila"
#: templates/admin.php:39
msgid "Log"
@@ -229,8 +229,8 @@ msgid "Other"
msgstr "Drugo"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "PodSkrbnik"
+msgid "Group Admin"
+msgstr "Administrator skupine"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/sl/tasks.po b/l10n/sl/tasks.po
index 38b18733898..6f77b49256f 100644
--- a/l10n/sl/tasks.po
+++ b/l10n/sl/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 15:38+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"
@@ -19,47 +20,47 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "Neveljaven datum/čas"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "Opravila"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "Ni kategorije"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "Nedoločen"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=najvišje"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=srednje"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=najnižje"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "Prazen povzetek"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "Neveljaven odstotek dokončanja"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "Neveljavna prednost"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "Dodaj opravilo"
#: templates/tasks.php:4
msgid "Order Due"
@@ -87,20 +88,20 @@ msgstr ""
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "Nalagam opravila..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "Pomembno"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "Več"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "Manj"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "Izbriši"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index b46b9b67977..55c993f1bf8 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 14:56+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"
@@ -19,24 +20,24 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Gostitelj"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokol lahko izpustite, razen če zahtevate SSL. V tem primeru začnite z ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Osnovni DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "Uporabnik DN"
#: templates/settings.php:10
msgid ""
@@ -47,15 +48,15 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Geslo"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Za anonimni dostop pustite polji za DN in geslo prazni."
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Filter prijav uporabnikov"
#: templates/settings.php:12
#, php-format
@@ -67,27 +68,27 @@ msgstr ""
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "uporabite ogrado %%uid, npr. \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Filter seznama uporabnikov"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "Brez katerekoli ograde, npr. \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Filter skupin"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Določi filter za uporabo med pridobivanjem skupin."
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
@@ -95,7 +96,7 @@ msgstr ""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Vrata"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -111,11 +112,11 @@ msgstr ""
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Uporabi TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Onemogoči potrditev veljavnosti SSL certifikata."
#: templates/settings.php:23
msgid ""
@@ -133,7 +134,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Odsvetovano, uporabite le v namene preizkušanja."
#: templates/settings.php:24
msgid "User Display Name Field"
@@ -153,7 +154,7 @@ msgstr ""
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "v bajtih"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
@@ -161,4 +162,4 @@ msgstr ""
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "Pomoč"
diff --git a/l10n/sl/user_migrate.po b/l10n/sl/user_migrate.po
index e3a229549d2..ec8deacf770 100644
--- a/l10n/sl/user_migrate.po
+++ b/l10n/sl/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:17+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"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "Izvozi"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "Med ustvarjanjem datoteke za izvoz je prišlo do napake"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "Prišlo je do napake"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "Izvozi vaš uporabniški račun"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "Ustvarjena bo stisnjena datoteka z vašim ownCloud računom."
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "Uvozi uporabniški račun"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "Zip datoteka ownCloud uporabnika"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "Uvozi"
diff --git a/l10n/sl/user_openid.po b/l10n/sl/user_openid.po
index 1269ed895e3..38b10648491 100644
--- a/l10n/sl/user_openid.po
+++ b/l10n/sl/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Peter Peroša <peter.perosa@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-15 00: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"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "To je OpenID strežniška končna točka. Za več informacij si oglejte"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "Identiteta: <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "Področje: <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "Uporabnik:"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "Prijava"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Napaka: <b>Uporabnik ni bil izbran"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "s tem naslovom se lahko overite tudi na drugih straneh"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Odobren ponudnik OpenID"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index 48bc4a90b16..eb287908918 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index d9257419c77..bc0ef8b76cb 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 87d87ab2e5d..db92cfe5b3b 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 8a1ec02ddbf..58e3af2ba44 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 25c7058c75a..e729393237a 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index b0d7bcaa1aa..75b8006fa26 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index ec6bc7bdca8..d20a227acb4 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-17 07:25+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"
@@ -83,7 +83,7 @@ msgstr "Minst ett fält måste fyllas i."
#: ajax/contact/addproperty.php:76
msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Försöker lägga till dubblett:"
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
@@ -245,8 +245,8 @@ msgstr "Kunde inte hitta en giltig adress."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Fel"
@@ -280,7 +280,7 @@ msgstr "Filen du försöker ladda upp är större än den maximala storleken fö
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "Fel vid hämtning av profilbild."
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -292,6 +292,10 @@ msgid ""
"them to be deleted."
msgstr "Vissa kontakter är markerade för radering, men är inte raderade än. Vänta tills dom är raderade."
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "Vill du slå samman dessa adressböcker?"
+
#: js/loader.js:49
msgid "Result: "
msgstr "Resultat:"
@@ -815,11 +819,11 @@ msgstr "Anpassa adressböcker."
msgid "Select Address Books"
msgstr "Välj adressböcker"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "Ange namn"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Ange beskrivning"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 759aac3b942..b4b73aa87c9 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 09:45+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"
@@ -78,19 +78,19 @@ msgstr "Säkerhetsvarning"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "utför en uppgift vid varje sidladdning"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php är registrerad på en webcron-tjänst"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "använd systemets cron-tjänst"
#: templates/admin.php:39
msgid "Log"
@@ -233,8 +233,8 @@ msgid "Other"
msgstr "Annat"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Underadministratör"
+msgid "Group Admin"
+msgstr "Gruppadministratör"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index a13ed61b4fb..937a61857a7 100644
--- a/l10n/templates/admin_dependencies_chk.pot
+++ b/l10n/templates/admin_dependencies_chk.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index 302ee091d13..d98a9734fae 100644
--- a/l10n/templates/admin_migrate.pot
+++ b/l10n/templates/admin_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 92ee8440f3f..6de5ed60ac6 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index 2d55307b1f5..f68a48cb23a 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/contacts.pot b/l10n/templates/contacts.pot
index be8c432c003..c51a96c39af 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -314,7 +318,7 @@ msgstr ""
msgid "Contact could not be found."
msgstr ""
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:112 templates/part.contact.php:116
msgid "Address"
msgstr ""
@@ -322,12 +326,12 @@ msgstr ""
msgid "Telephone"
msgstr ""
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:114 templates/part.contact.php:115
msgid "Email"
msgstr ""
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
msgid "Organization"
msgstr ""
@@ -371,8 +375,8 @@ msgstr ""
msgid "Internet"
msgstr ""
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:183 templates/part.contact.php:44
+#: templates/part.contact.php:113
msgid "Birthday"
msgstr ""
@@ -524,113 +528,113 @@ msgstr ""
msgid "Select photo from ownCloud"
msgstr ""
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr ""
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
msgid "Edit name details"
msgstr ""
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:33
msgid "Delete"
msgstr ""
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
msgid "Nickname"
msgstr ""
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
msgid "Enter nickname"
msgstr ""
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
msgid "Web site"
msgstr ""
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
msgid "http://www.somesite.com"
msgstr ""
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
msgid "Go to web site"
msgstr ""
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
msgid "dd-mm-yyyy"
msgstr ""
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
msgid "Groups"
msgstr ""
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
msgid "Separate groups with commas"
msgstr ""
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
msgid "Edit groups"
msgstr ""
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
msgid "Preferred"
msgstr ""
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
msgid "Please specify a valid email address."
msgstr ""
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
msgid "Enter email address"
msgstr ""
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
msgid "Mail to address"
msgstr ""
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
msgid "Delete email address"
msgstr ""
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
msgid "Enter phone number"
msgstr ""
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
msgid "Delete phone number"
msgstr ""
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
msgid "View on map"
msgstr ""
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
msgid "Edit address details"
msgstr ""
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
msgid "Add notes here."
msgstr ""
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
msgid "Add field"
msgstr ""
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
msgid "Phone"
msgstr ""
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
msgid "Note"
msgstr ""
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
msgid "Download contact"
msgstr ""
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
msgid "Delete contact"
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c10170659b9..64a7558f57c 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,51 +37,51 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:574
+#: js/js.js:575
msgid "January"
msgstr ""
-#: js/js.js:574
+#: js/js.js:575
msgid "February"
msgstr ""
-#: js/js.js:574
+#: js/js.js:575
msgid "March"
msgstr ""
-#: js/js.js:574
+#: js/js.js:575
msgid "April"
msgstr ""
-#: js/js.js:574
+#: js/js.js:575
msgid "May"
msgstr ""
-#: js/js.js:574
+#: js/js.js:575
msgid "June"
msgstr ""
-#: js/js.js:575
+#: js/js.js:576
msgid "July"
msgstr ""
-#: js/js.js:575
+#: js/js.js:576
msgid "August"
msgstr ""
-#: js/js.js:575
+#: js/js.js:576
msgid "September"
msgstr ""
-#: js/js.js:575
+#: js/js.js:576
msgid "October"
msgstr ""
-#: js/js.js:575
+#: js/js.js:576
msgid "November"
msgstr ""
-#: js/js.js:575
+#: js/js.js:576
msgid "December"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index a9c93a4741b..c7fdd2ab4bd 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 34a0bbb5bef..1b662cfe22c 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6a82898883f..0e2addeae4e 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d288470e5c0..b22fd5200b7 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 00654d249b7..b603771b682 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index d17762fbbde..3da7373d74d 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index f6ce8f0969c..0347424549e 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: files.php:245
+#: files.php:249
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:246
+#: files.php:250
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:246 files.php:271
+#: files.php:250 files.php:275
msgid "Back to Files"
msgstr ""
-#: files.php:270
+#: files.php:274
msgid "Selected files too large to generate zip file."
msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 51fdfab817f..92ef602a4f6 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d74ce84806c..d280cf65441 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -226,7 +226,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/templates/tasks.pot b/l10n/templates/tasks.pot
index b38b306f790..140661bf310 100644
--- a/l10n/templates/tasks.pot
+++ b/l10n/templates/tasks.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f9a5686e395..d4cb01eef02 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-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_migrate.pot b/l10n/templates/user_migrate.pot
index e0a064d9613..94814afec2a 100644
--- a/l10n/templates/user_migrate.pot
+++ b/l10n/templates/user_migrate.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_openid.pot b/l10n/templates/user_openid.pot
index 352a3ccbc02..06813aae871 100644
--- a/l10n/templates/user_openid.pot
+++ b/l10n/templates/user_openid.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 02:02+0200\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/admin_dependencies_chk.po b/l10n/th_TH/admin_dependencies_chk.po
index 758b5772cd9..95abe0c6526 100644
--- a/l10n/th_TH/admin_dependencies_chk.po
+++ b/l10n/th_TH/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 14:18+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"
@@ -21,53 +22,53 @@ msgstr ""
msgid ""
"The php-json module is needed by the many applications for inter "
"communications"
-msgstr ""
+msgstr "โมดูล php-json จำเป็นต้องใช้สำหรับแอพพลิเคชั่นหลายๆตัวเพื่อการเชื่อมต่อสากล"
#: settings.php:39
msgid ""
"The php-curl modude is needed to fetch the page title when adding a "
"bookmarks"
-msgstr ""
+msgstr "โมดูล php-curl จำเป็นต้องใช้สำหรับดึงข้อมูลชื่อหัวเว็บเมื่อเพิ่มเข้าไปยังรายการโปรด"
#: settings.php:45
msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "โมดูล php-gd จำเป็นต้องใช้สำหรับสร้างรูปภาพขนาดย่อของรูปภาพของคุณ"
#: settings.php:51
msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "โมดูล php-ldap จำเป็นต้องใช้สำหรับการเชื่อมต่อกับเซิร์ฟเวอร์ ldap ของคุณ"
#: settings.php:57
msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "โมดูล php-zip จำเป็นต้องใช้สำหรับดาวน์โหลดไฟล์พร้อมกันหลายๆไฟล์ในครั้งเดียว"
#: settings.php:63
msgid ""
"The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "โมดูล php-mb_multibyte จำเป็นต้องใช้สำหรับการจัดการการแปลงรหัสไฟล์อย่างถูกต้อง"
#: settings.php:69
msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "โมดูล php-ctype จำเป็นต้องใช้สำหรับตรวจสอบความถูกต้องของข้อมูล"
#: settings.php:75
msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "โมดูล php-xml จำเป็นต้องใช้สำหรับแชร์ไฟล์ด้วย webdav"
#: settings.php:81
msgid ""
"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
" knowledge base from OCS servers"
-msgstr ""
+msgstr "คำสั่ง allow_url_fopen ที่อยู่ในไฟล์ php.ini ของคุณ ควรกำหนดเป็น 1 เพื่อดึงข้อมูลของฐานความรู้ต่างๆจากเซิร์ฟเวอร์ของ OCS"
#: settings.php:87
msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "โมดูล php-pdo จำเป็นต้องใช้สำหรับจัดเก็บข้อมูลใน owncloud เข้าไปไว้ยังฐานข้อมูล"
#: templates/settings.php:2
msgid "Dependencies status"
-msgstr ""
+msgstr "สถานะการอ้างอิง"
#: templates/settings.php:7
msgid "Used by :"
-msgstr ""
+msgstr "ใช้งานโดย:"
diff --git a/l10n/th_TH/admin_migrate.po b/l10n/th_TH/admin_migrate.po
index 24c02530e3b..c3f57864015 100644
--- a/l10n/th_TH/admin_migrate.po
+++ b/l10n/th_TH/admin_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:09+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"
@@ -19,14 +20,14 @@ msgstr ""
#: templates/settings.php:3
msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "ส่งออกข้อมูลค่าสมมุติของ ownCloud นี้"
#: templates/settings.php:4
msgid ""
"This will create a compressed file that contains the data of this owncloud instance.\n"
" Please choose the export type:"
-msgstr ""
+msgstr "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลค่าสมมุติของ ownCloud.\n กรุณาเลือกชนิดของการส่งออกข้อมูล:"
#: templates/settings.php:12
msgid "Export"
-msgstr ""
+msgstr "ส่งออก"
diff --git a/l10n/th_TH/bookmarks.po b/l10n/th_TH/bookmarks.po
index e5a515c7dc2..0c6e7c61e3d 100644
--- a/l10n/th_TH/bookmarks.po
+++ b/l10n/th_TH/bookmarks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:16+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"
@@ -19,42 +20,42 @@ msgstr ""
#: appinfo/app.php:14
msgid "Bookmarks"
-msgstr ""
+msgstr "รายการโปรด"
#: bookmarksHelper.php:99
msgid "unnamed"
-msgstr ""
+msgstr "ยังไม่มีชื่อ"
#: templates/bookmarklet.php:5
msgid ""
"Drag this to your browser bookmarks and click it, when you want to bookmark "
"a webpage quickly:"
-msgstr ""
+msgstr "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว"
#: templates/bookmarklet.php:7
msgid "Read later"
-msgstr ""
+msgstr "อ่านภายหลัง"
#: templates/list.php:13
msgid "Address"
-msgstr ""
+msgstr "ที่อยู่"
#: templates/list.php:14
msgid "Title"
-msgstr ""
+msgstr "ชื่อ"
#: templates/list.php:15
msgid "Tags"
-msgstr ""
+msgstr "ป้ายกำกับ"
#: templates/list.php:16
msgid "Save bookmark"
-msgstr ""
+msgstr "บันทึกรายการโปรด"
#: templates/list.php:22
msgid "You have no bookmarks"
-msgstr ""
+msgstr "คุณยังไม่มีรายการโปรด"
#: templates/settings.php:11
msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/th_TH/calendar.po b/l10n/th_TH/calendar.po
index 9803e716021..db695db5dca 100644
--- a/l10n/th_TH/calendar.po
+++ b/l10n/th_TH/calendar.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:30+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"
@@ -21,11 +21,11 @@ msgstr ""
#: ajax/cache/status.php:19
msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "ไม่ใช่ปฏิทินทั้งหมดที่จะถูกจัดเก็บข้อมูลไว้ในหน่วยความจำแคชอย่างสมบูรณ์"
#: ajax/cache/status.php:21
msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "ทุกสิ่งทุกอย่างได้ถูกเก็บเข้าไปไว้ในหน่วยความจำแคชอย่างสมบูรณ์แล้ว"
#: ajax/categories/rescan.php:29
msgid "No calendars found."
@@ -43,19 +43,19 @@ msgstr "ปฏิทินไม่ถูกต้อง"
msgid ""
"The file contained either no events or all events are already saved in your "
"calendar."
-msgstr ""
+msgstr "ไฟล์ดังกล่าวบรรจุข้อมูลกิจกรรมที่มีอยู่แล้วในปฏิทินของคุณ"
#: ajax/import/dropimport.php:31 ajax/import/import.php:67
msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "กิจกรรมได้ถูกบันทึกไปไว้ในปฏิทินที่สร้างขึ้นใหม่แล้ว"
#: ajax/import/import.php:56
msgid "Import failed"
-msgstr ""
+msgstr "การนำเข้าข้อมูลล้มเหลว"
#: ajax/import/import.php:69
msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "กิจกรรมได้ถูกบันทึกเข้าไปไว้ในปฏิทินของคุณแล้ว"
#: ajax/settings/guesstimezone.php:25
msgid "New Timezone:"
@@ -160,7 +160,7 @@ msgstr "งาน"
#: lib/app.php:351 lib/app.php:361
msgid "by"
-msgstr ""
+msgstr "โดย"
#: lib/app.php:359 lib/app.php:399
msgid "unnamed"
@@ -349,79 +349,79 @@ msgstr "คำนวณ"
#: templates/calendar.php:6
msgid "Sun."
-msgstr ""
+msgstr "อา."
#: templates/calendar.php:6
msgid "Mon."
-msgstr ""
+msgstr "จ."
#: templates/calendar.php:6
msgid "Tue."
-msgstr ""
+msgstr "อ."
#: templates/calendar.php:6
msgid "Wed."
-msgstr ""
+msgstr "พ."
#: templates/calendar.php:6
msgid "Thu."
-msgstr ""
+msgstr "พฤ."
#: templates/calendar.php:6
msgid "Fri."
-msgstr ""
+msgstr "ศ."
#: templates/calendar.php:6
msgid "Sat."
-msgstr ""
+msgstr "ส."
#: templates/calendar.php:8
msgid "Jan."
-msgstr ""
+msgstr "ม.ค."
#: templates/calendar.php:8
msgid "Feb."
-msgstr ""
+msgstr "ก.พ."
#: templates/calendar.php:8
msgid "Mar."
-msgstr ""
+msgstr "มี.ค."
#: templates/calendar.php:8
msgid "Apr."
-msgstr ""
+msgstr "เม.ย."
#: templates/calendar.php:8
msgid "May."
-msgstr ""
+msgstr "พ.ค."
#: templates/calendar.php:8
msgid "Jun."
-msgstr ""
+msgstr "มิ.ย."
#: templates/calendar.php:8
msgid "Jul."
-msgstr ""
+msgstr "ก.ค."
#: templates/calendar.php:8
msgid "Aug."
-msgstr ""
+msgstr "ส.ค."
#: templates/calendar.php:8
msgid "Sep."
-msgstr ""
+msgstr "ก.ย."
#: templates/calendar.php:8
msgid "Oct."
-msgstr ""
+msgstr "ต.ค."
#: templates/calendar.php:8
msgid "Nov."
-msgstr ""
+msgstr "พ.ย."
#: templates/calendar.php:8
msgid "Dec."
-msgstr ""
+msgstr "ธ.ค."
#: templates/calendar.php:11
msgid "All day"
@@ -478,7 +478,7 @@ msgstr "วันนี้"
#: templates/calendar.php:46 templates/calendar.php:47
msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
#: templates/part.choosecalendar.php:2
msgid "Your calendars"
@@ -686,7 +686,7 @@ msgstr "นำเข้าไฟล์ปฏิทิน"
#: templates/part.import.php:24
msgid "Please choose a calendar"
-msgstr ""
+msgstr "กรุณาเลือกปฏิทิน"
#: templates/part.import.php:36
msgid "Name of new calendar"
@@ -694,13 +694,13 @@ msgstr "ชื่อของปฏิทิน"
#: templates/part.import.php:44
msgid "Take an available name!"
-msgstr ""
+msgstr "เลือกชื่อที่ต้องการ"
#: templates/part.import.php:45
msgid ""
"A Calendar with this name already exists. If you continue anyhow, these "
"calendars will be merged."
-msgstr ""
+msgstr "ปฏิทินชื่อดังกล่าวถูกใช้งานไปแล้ว หากคุณยังดำเนินการต่อไป ปฏิทินดังกล่าวนี้จะถูกผสานข้อมูลเข้าด้วยกัน"
#: templates/part.import.php:47
msgid "Import"
@@ -732,7 +732,7 @@ msgstr "ที่"
#: templates/settings.php:10
msgid "General"
-msgstr ""
+msgstr "ทั่วไป"
#: templates/settings.php:15
msgid "Timezone"
@@ -740,11 +740,11 @@ msgstr "โซนเวลา"
#: templates/settings.php:47
msgid "Update timezone automatically"
-msgstr ""
+msgstr "อัพเดทโซนเวลาอัตโนมัติ"
#: templates/settings.php:52
msgid "Time format"
-msgstr ""
+msgstr "รูปแบบเวลา"
#: templates/settings.php:57
msgid "24h"
@@ -756,39 +756,39 @@ msgstr "12 ช.ม."
#: templates/settings.php:64
msgid "Start week on"
-msgstr ""
+msgstr "เริ่มต้นสัปดาห์ด้วย"
#: templates/settings.php:76
msgid "Cache"
-msgstr ""
+msgstr "หน่วยความจำแคช"
#: templates/settings.php:80
msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "ล้างข้อมูลในหน่วยความจำแคชสำหรับกิจกรรมที่ซ้ำซ้อน"
#: templates/settings.php:85
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: templates/settings.php:87
msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "ที่อยู่ที่ใช้สำหรับเชื่อมข้อมูลปฏิทิน CalDAV"
#: templates/settings.php:87
msgid "more info"
-msgstr ""
+msgstr "ข้อมูลเพิ่มเติม"
#: templates/settings.php:89
msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "ที่อยู่หลัก (Kontact et al)"
#: templates/settings.php:91
msgid "iOS/OS X"
-msgstr ""
+msgstr "iOS/OS X"
#: templates/settings.php:93
msgid "Read only iCalendar link(s)"
-msgstr ""
+msgstr "อ่านเฉพาะลิงก์ iCalendar เท่านั้น"
#: templates/share.dropdown.php:20
msgid "Users"
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index 33ab6b35675..a4507907d03 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 15:10+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"
@@ -67,7 +67,7 @@ msgstr "ยังไม่ได้กำหนดชื่อ"
#: ajax/contact/addproperty.php:46
msgid "Could not parse contact: "
-msgstr ""
+msgstr "ไม่สามารถแจกแจงรายชื่อผู้ติดต่อได้"
#: ajax/contact/addproperty.php:56
msgid "Cannot add empty property."
@@ -83,7 +83,7 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
#: ajax/contact/addproperty.php:144
msgid "Error adding contact property: "
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการเพิ่มคุณสมบัติข้อมูลผู้ติดต่อ"
#: ajax/contact/deleteproperty.php:37
msgid "Information about vCard is incorrect. Please reload the page."
@@ -241,8 +241,8 @@ msgstr "ไม่สามารถดึงที่อยู่ที่ถู
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "พบข้อผิดพลาด"
@@ -276,7 +276,7 @@ msgstr "ไฟล์ที่คุณกำลังพยายามที่
#: js/contacts.js:1236
msgid "Error loading profile picture."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพประจำตัว"
#: js/contacts.js:1337 js/contacts.js:1371
msgid "Select type"
@@ -286,7 +286,11 @@ msgstr "เลือกชนิด"
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อบางรายการได้ถูกทำเครื่องหมายสำหรับลบทิ้งเอาไว้, แต่ยังไม่ได้ถูกลบทิ้ง, กรุณารอให้รายการดังกล่าวถูกลบทิ้งเสียก่อน"
+
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr "คุณต้องการผสานข้อมูลสมุดบันทึกที่อยู่เหล่านี้หรือไม่?"
#: js/loader.js:49
msgid "Result: "
@@ -302,11 +306,11 @@ msgstr " ล้มเหลว."
#: js/settings.js:67
msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "ชื่อที่ใช้แสดงไม่สามารถเว้นว่างได้"
#: lib/app.php:36
msgid "Addressbook not found: "
-msgstr ""
+msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
#: lib/app.php:49
msgid "This is not your addressbook."
@@ -316,7 +320,7 @@ msgstr "นี่ไม่ใช่สมุดบันทึกที่อย
msgid "Contact could not be found."
msgstr "ไม่พบข้อมูลการติดต่อ"
-#: lib/app.php:112 templates/part.contact.php:117
+#: lib/app.php:112 templates/part.contact.php:116
msgid "Address"
msgstr "ที่อยู่"
@@ -324,12 +328,12 @@ msgstr "ที่อยู่"
msgid "Telephone"
msgstr "โทรศัพท์"
-#: lib/app.php:114 templates/part.contact.php:116
+#: lib/app.php:114 templates/part.contact.php:115
msgid "Email"
msgstr "อีเมล์"
-#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
-#: templates/part.contact.php:112
+#: lib/app.php:115 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
msgid "Organization"
msgstr "หน่วยงาน"
@@ -373,62 +377,62 @@ msgstr "เพจเจอร์"
msgid "Internet"
msgstr "อินเทอร์เน็ต"
-#: lib/app.php:183 templates/part.contact.php:45
-#: templates/part.contact.php:114
+#: lib/app.php:183 templates/part.contact.php:44
+#: templates/part.contact.php:113
msgid "Birthday"
msgstr "วันเกิด"
#: lib/app.php:184
msgid "Business"
-msgstr ""
+msgstr "ธุรกิจ"
#: lib/app.php:185
msgid "Call"
-msgstr ""
+msgstr "โทร"
#: lib/app.php:186
msgid "Clients"
-msgstr ""
+msgstr "ลูกค้า"
#: lib/app.php:187
msgid "Deliverer"
-msgstr ""
+msgstr "ผู้จัดส่ง"
#: lib/app.php:188
msgid "Holidays"
-msgstr ""
+msgstr "วันหยุด"
#: lib/app.php:189
msgid "Ideas"
-msgstr ""
+msgstr "ไอเดีย"
#: lib/app.php:190
msgid "Journey"
-msgstr ""
+msgstr "การเดินทาง"
#: lib/app.php:191
msgid "Jubilee"
-msgstr ""
+msgstr "งานเฉลิมฉลอง"
#: lib/app.php:192
msgid "Meeting"
-msgstr ""
+msgstr "ประชุม"
#: lib/app.php:193
msgid "Other"
-msgstr ""
+msgstr "อื่นๆ"
#: lib/app.php:194
msgid "Personal"
-msgstr ""
+msgstr "ส่วนตัว"
#: lib/app.php:195
msgid "Projects"
-msgstr ""
+msgstr "โปรเจค"
#: lib/app.php:196
msgid "Questions"
-msgstr ""
+msgstr "คำถาม"
#: lib/hooks.php:102
msgid "{name}'s Birthday"
@@ -448,7 +452,7 @@ msgstr "นำเข้า"
#: templates/index.php:18
msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
#: templates/index.php:18 templates/settings.php:9
msgid "Addressbooks"
@@ -460,51 +464,51 @@ msgstr "ปิด"
#: templates/index.php:37
msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "ปุ่มลัด"
#: templates/index.php:39
msgid "Navigation"
-msgstr ""
+msgstr "ระบบเมนู"
#: templates/index.php:42
msgid "Next contact in list"
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อถัดไปในรายการ"
#: templates/index.php:44
msgid "Previous contact in list"
-msgstr ""
+msgstr "ข้อมูลผู้ติดต่อก่อนหน้าในรายการ"
#: templates/index.php:46
msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "ขยาย/ย่อ สมุดบันทึกที่อยู่ปัจจุบัน"
#: templates/index.php:48
msgid "Next addressbook"
-msgstr ""
+msgstr "สมุดบันทึกที่อยู่ถัดไป"
#: templates/index.php:50
msgid "Previous addressbook"
-msgstr ""
+msgstr "สมุดบันทึกที่อยู่ก่อนหน้า"
#: templates/index.php:54
msgid "Actions"
-msgstr ""
+msgstr "การกระทำ"
#: templates/index.php:57
msgid "Refresh contacts list"
-msgstr ""
+msgstr "รีเฟรชรายชื่อผู้ติดต่อใหม่"
#: templates/index.php:59
msgid "Add new contact"
-msgstr ""
+msgstr "เพิ่มข้อมูลผู้ติดต่อใหม่"
#: templates/index.php:61
msgid "Add new addressbook"
-msgstr ""
+msgstr "เพิ่มสมุดบันทึกที่อยู่ใหม่"
#: templates/index.php:63
msgid "Delete current contact"
-msgstr ""
+msgstr "ลบข้อมูลผู้ติดต่อปัจจุบัน"
#: templates/part.contact.php:17
msgid "Drop photo to upload"
@@ -526,113 +530,113 @@ msgstr "อัพโหลดรูปภาพใหม่"
msgid "Select photo from ownCloud"
msgstr "เลือกรูปภาพจาก ownCloud"
-#: templates/part.contact.php:35
+#: templates/part.contact.php:34
msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
-#: templates/part.contact.php:36
+#: templates/part.contact.php:35
msgid "Edit name details"
msgstr "แก้ไขรายละเอียดของชื่อ"
-#: templates/part.contact.php:40 templates/part.contact.php:42
-#: templates/part.contact.php:44 templates/part.contact.php:46
-#: templates/part.contact.php:50 templates/settings.php:33
+#: templates/part.contact.php:39 templates/part.contact.php:41
+#: templates/part.contact.php:43 templates/part.contact.php:45
+#: templates/part.contact.php:49 templates/settings.php:33
msgid "Delete"
msgstr "ลบ"
-#: templates/part.contact.php:41 templates/part.contact.php:113
+#: templates/part.contact.php:40 templates/part.contact.php:112
msgid "Nickname"
msgstr "ชื่อเล่น"
-#: templates/part.contact.php:42
+#: templates/part.contact.php:41
msgid "Enter nickname"
msgstr "กรอกชื่อเล่น"
-#: templates/part.contact.php:43 templates/part.contact.php:119
+#: templates/part.contact.php:42 templates/part.contact.php:118
msgid "Web site"
-msgstr ""
+msgstr "เว็บไซต์"
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
-#: templates/part.contact.php:44
+#: templates/part.contact.php:43
msgid "Go to web site"
-msgstr ""
+msgstr "ไปที่เว็บไซต์"
-#: templates/part.contact.php:46
+#: templates/part.contact.php:45
msgid "dd-mm-yyyy"
msgstr "dd-mm-yyyy"
-#: templates/part.contact.php:47 templates/part.contact.php:120
+#: templates/part.contact.php:46 templates/part.contact.php:119
msgid "Groups"
msgstr "กลุ่ม"
-#: templates/part.contact.php:49
+#: templates/part.contact.php:48
msgid "Separate groups with commas"
msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
-#: templates/part.contact.php:50
+#: templates/part.contact.php:49
msgid "Edit groups"
msgstr "แก้ไขกลุ่ม"
-#: templates/part.contact.php:63 templates/part.contact.php:77
+#: templates/part.contact.php:62 templates/part.contact.php:76
msgid "Preferred"
msgstr "พิเศษ"
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
msgid "Please specify a valid email address."
msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
-#: templates/part.contact.php:64
+#: templates/part.contact.php:63
msgid "Enter email address"
msgstr "กรอกที่อยู่อีเมล"
-#: templates/part.contact.php:68
+#: templates/part.contact.php:67
msgid "Mail to address"
msgstr "ส่งอีเมลไปที่"
-#: templates/part.contact.php:69
+#: templates/part.contact.php:68
msgid "Delete email address"
msgstr "ลบที่อยู่อีเมล"
-#: templates/part.contact.php:78
+#: templates/part.contact.php:77
msgid "Enter phone number"
msgstr "กรอกหมายเลขโทรศัพท์"
-#: templates/part.contact.php:82
+#: templates/part.contact.php:81
msgid "Delete phone number"
msgstr "ลบหมายเลขโทรศัพท์"
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
msgid "View on map"
msgstr "ดูบนแผนที่"
-#: templates/part.contact.php:92
+#: templates/part.contact.php:91
msgid "Edit address details"
msgstr "แก้ไขรายละเอียดที่อยู่"
-#: templates/part.contact.php:103
+#: templates/part.contact.php:102
msgid "Add notes here."
msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
-#: templates/part.contact.php:110
+#: templates/part.contact.php:109
msgid "Add field"
msgstr "เพิ่มช่องรับข้อมูล"
-#: templates/part.contact.php:115
+#: templates/part.contact.php:114
msgid "Phone"
msgstr "โทรศัพท์"
-#: templates/part.contact.php:118
+#: templates/part.contact.php:117
msgid "Note"
msgstr "หมายเหตุ"
-#: templates/part.contact.php:123
+#: templates/part.contact.php:122
msgid "Download contact"
msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
-#: templates/part.contact.php:124
+#: templates/part.contact.php:123
msgid "Delete contact"
msgstr "ลบข้อมูลการติดต่อ"
@@ -655,11 +659,11 @@ msgstr "ตู้ ปณ."
#: templates/part.edit_address_dialog.php:24
msgid "Street address"
-msgstr ""
+msgstr "ที่อยู่"
#: templates/part.edit_address_dialog.php:27
msgid "Street and number"
-msgstr ""
+msgstr "ถนนและหมายเลข"
#: templates/part.edit_address_dialog.php:30
msgid "Extended"
@@ -667,7 +671,7 @@ msgstr "เพิ่ม"
#: templates/part.edit_address_dialog.php:33
msgid "Apartment number etc."
-msgstr ""
+msgstr "หมายเลขอพาร์ทเมนต์ ฯลฯ"
#: templates/part.edit_address_dialog.php:36
#: templates/part.edit_address_dialog.php:39
@@ -680,7 +684,7 @@ msgstr "ภูมิภาค"
#: templates/part.edit_address_dialog.php:45
msgid "E.g. state or province"
-msgstr ""
+msgstr "เช่น รัฐ หรือ จังหวัด"
#: templates/part.edit_address_dialog.php:48
msgid "Zipcode"
@@ -688,7 +692,7 @@ msgstr "รหัสไปรษณีย์"
#: templates/part.edit_address_dialog.php:51
msgid "Postal code"
-msgstr ""
+msgstr "รหัสไปรษณีย์"
#: templates/part.edit_address_dialog.php:54
#: templates/part.edit_address_dialog.php:57
@@ -809,15 +813,15 @@ msgstr "กำหนดค่าสมุดบันทึกที่อยู
#: templates/part.selectaddressbook.php:1
msgid "Select Address Books"
-msgstr ""
+msgstr "เลือกสมุดบันทึกที่อยู่"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
-msgstr ""
+msgstr "กรอกชื่อ"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
-msgstr ""
+msgstr "กรอกคำอธิบาย"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"
@@ -837,11 +841,11 @@ msgstr "iOS/OS X"
#: templates/settings.php:20
msgid "Show CardDav link"
-msgstr ""
+msgstr "แสดงลิงก์ CardDav"
#: templates/settings.php:23
msgid "Show read-only VCF link"
-msgstr ""
+msgstr "แสดงลิงก์ VCF สำหรับอ่านเท่านั้น"
#: templates/settings.php:26
msgid "Download"
@@ -857,11 +861,11 @@ msgstr "สร้างสมุดบันทึกข้อมูลการ
#: templates/settings.php:41
msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
#: templates/settings.php:42
msgid "Description"
-msgstr ""
+msgstr "คำอธิบาย"
#: templates/settings.php:43
msgid "Save"
@@ -873,4 +877,4 @@ msgstr "ยกเลิก"
#: templates/settings.php:49
msgid "More..."
-msgstr ""
+msgstr "เพิ่มเติม..."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index f1966051f32..c5a8f013b6d 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-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 12:47+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"
@@ -55,7 +55,7 @@ msgstr "ไฟล์"
#: js/fileactions.js:95
msgid "Unshare"
-msgstr ""
+msgstr "ยกเลิกการแชร์ข้อมูล"
#: js/fileactions.js:97 templates/index.php:56
msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "ลบ"
#: js/filelist.js:141
msgid "already exists"
-msgstr ""
+msgstr "มีอยู่แล้ว"
#: js/filelist.js:141
msgid "replace"
-msgstr ""
+msgstr "แทนที่"
#: js/filelist.js:141
msgid "cancel"
-msgstr ""
+msgstr "ยกเลิก"
#: js/filelist.js:195
msgid "replaced"
-msgstr ""
+msgstr "แทนที่แล้ว"
#: js/filelist.js:195
msgid "with"
-msgstr ""
+msgstr "กับ"
#: js/filelist.js:195 js/filelist.js:256
msgid "undo"
-msgstr ""
+msgstr "เลิกทำ"
#: js/filelist.js:256
msgid "deleted"
-msgstr ""
+msgstr "ลบแล้ว"
#: js/files.js:170
msgid "generating ZIP-file, it may take some time."
@@ -113,27 +113,27 @@ msgstr "การอัพโหลดถูกยกเลิก"
msgid "Invalid name, '/' is not allowed."
msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
msgid "Modified"
msgstr "ปรับปรุงล่าสุด"
-#: js/files.js:659
+#: js/files.js:722
msgid "folder"
msgstr "โฟลเดอร์"
-#: js/files.js:661
+#: js/files.js:724
msgid "folders"
msgstr "โฟลเดอร์"
-#: js/files.js:669
+#: js/files.js:732
msgid "file"
msgstr "ไฟล์"
-#: js/files.js:671
+#: js/files.js:734
msgid "files"
msgstr "ไฟล์"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 6852b6b1c35..f396eed4dab 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:12+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"
@@ -19,16 +20,16 @@ msgstr ""
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "การเข้ารหัส"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "ไม่ต้องรวมชนิดของไฟล์ดังต่อไปนี้จากการเข้ารหัส"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "ไม่ต้อง"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "เปิดใช้งานการเข้ารหัส"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 77ddd37e99a..2ba0dcb2652 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:02+0200\n"
+"PO-Revision-Date: 2012-08-14 13:35+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"
@@ -19,64 +20,64 @@ msgstr ""
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "พื้นทีจัดเก็บข้อมูลจากภายนอก"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "จุดชี้ตำแหน่ง"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "ด้านหลังระบบ"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "การกำหนดค่า"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "ตัวเลือก"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "สามารถใช้งานได้"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "เพิ่มจุดชี้ตำแหน่ง"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "ยังไม่มีการกำหนด"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "ผู้ใช้งานทั้งหมด"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "กลุ่ม"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "ผู้ใช้งาน"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "ลบ"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 9165a75b356..250856835fc 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:14+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"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/list.php:2
msgid "Your Shared Files"
-msgstr ""
+msgstr "ไฟล์ของคุณที่แชร์ไว้"
#: templates/list.php:6
msgid "Item"
-msgstr ""
+msgstr "ไอเท็ม"
#: templates/list.php:7
msgid "Shared With"
-msgstr ""
+msgstr "แชร์พร้อมกับ"
#: templates/list.php:8
msgid "Permissions"
-msgstr ""
+msgstr "สิทธิ์การเข้าใช้งาน"
#: templates/list.php:16
msgid "Read"
-msgstr ""
+msgstr "อ่าน"
#: templates/list.php:16
msgid "Edit"
-msgstr ""
+msgstr "แก้ไข"
#: templates/list.php:16 templates/list.php:17
msgid "Delete"
-msgstr ""
+msgstr "ลบ"
#: templates/settings.php:3
msgid "Enable Resharing"
-msgstr ""
+msgstr "เปิดให้มีการแชร์ใหม่อีกครั้งได้"
#: templates/settings.php:4
msgid "Allow users to reshare files they don't own"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ไฟล์ที่ไม่ได้เป็นเจ้าของใหม่ได้"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 797e78acb5d..4bab33ad9f7 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:11+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"
@@ -19,8 +20,8 @@ msgstr ""
#: js/settings-personal.js:31
msgid "Expire all versions"
-msgstr ""
+msgstr "หมดอายุทุกรุ่น"
#: templates/settings.php:3
msgid "Enable Files Versioning"
-msgstr ""
+msgstr "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
diff --git a/l10n/th_TH/gallery.po b/l10n/th_TH/gallery.po
index 1a8ef7a619a..d442789187d 100644
--- a/l10n/th_TH/gallery.po
+++ b/l10n/th_TH/gallery.po
@@ -9,88 +9,32 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Thai (Thailand) (http://www.transifex.net/projects/p/owncloud/language/th_TH/)\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 12:50+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"
"Content-Transfer-Encoding: 8bit\n"
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: appinfo/app.php:37
+#: appinfo/app.php:39
msgid "Pictures"
msgstr "รูปภาพ"
-#: js/album_cover.js:44
+#: js/pictures.js:12
msgid "Share gallery"
-msgstr ""
+msgstr "แชร์ข้อมูลแกลอรี่"
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
msgid "Error: "
-msgstr ""
+msgstr "พบข้อผิดพลาด: "
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
msgid "Internal error"
-msgstr ""
-
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "ตั้งค่า"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "ตรวจสอบอีกครั้ง"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "หยุด"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "แชร์"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "ย้อนกลับ"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "การยืนยันการลบ"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "คุณต้องการลบอัลบั้มออกหรือไม่"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "เปลี่ยนชื่ออัลบั้ม"
+msgstr "เกิดข้อผิดพลาดภายในระบบ"
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "ชื่อใหม่ของอัลบั้ม"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "ภาพสไลด์โชว์"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 2a9f5b46d5f..57847a06f6d 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:40+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"
@@ -17,96 +18,96 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: app.php:287
+#: app.php:288
msgid "Help"
-msgstr ""
+msgstr "ช่วยเหลือ"
-#: app.php:294
+#: app.php:295
msgid "Personal"
-msgstr ""
+msgstr "ส่วนตัว"
-#: app.php:299
+#: app.php:300
msgid "Settings"
-msgstr ""
+msgstr "ตั้งค่า"
-#: app.php:304
+#: app.php:305
msgid "Users"
-msgstr ""
+msgstr "ผู้ใช้งาน"
-#: app.php:311
+#: app.php:312
msgid "Apps"
-msgstr ""
+msgstr "แอปฯ"
-#: app.php:313
+#: app.php:314
msgid "Admin"
-msgstr ""
+msgstr "ผู้ดูแล"
#: files.php:245
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
#: files.php:246
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
#: files.php:246 files.php:271
msgid "Back to Files"
-msgstr ""
+msgstr "กลับไปที่ไฟล์"
#: files.php:270
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง"
#: template.php:86
msgid "seconds ago"
-msgstr ""
+msgstr "วินาทีที่ผ่านมา"
#: template.php:87
msgid "1 minute ago"
-msgstr ""
+msgstr "1 นาทีมาแล้ว"
#: template.php:88
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d นาทีที่ผ่านมา"
#: template.php:91
msgid "today"
-msgstr ""
+msgstr "วันนี้"
#: template.php:92
msgid "yesterday"
-msgstr ""
+msgstr "เมื่อวานนี้"
#: template.php:93
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d วันที่ผ่านมา"
#: template.php:94
msgid "last month"
-msgstr ""
+msgstr "เดือนที่แล้ว"
#: template.php:95
msgid "months ago"
-msgstr ""
+msgstr "เดือนมาแล้ว"
#: template.php:96
msgid "last year"
-msgstr ""
+msgstr "ปีที่แล้ว"
#: template.php:97
msgid "years ago"
-msgstr ""
+msgstr "ปีที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 37193911fc6..f2de2ffdc5c 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 15:11+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"
@@ -22,7 +22,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -42,7 +42,7 @@ msgstr "คำร้องขอไม่ถูกต้อง"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -50,7 +50,7 @@ msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "ข้อผิดพลาด"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -70,23 +70,23 @@ msgstr "ภาษาไทย"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php ได้ถูกลงทะเบียนที่บริการ webcron"
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "ใช้บริการ cron จากระบบ"
#: templates/admin.php:39
msgid "Log"
@@ -229,8 +229,8 @@ msgid "Other"
msgstr "อื่นๆ"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr ""
+msgid "Group Admin"
+msgstr "ผู้ดูแลกลุ่ม"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/th_TH/tasks.po b/l10n/th_TH/tasks.po
index 5cde08bac26..7d450237645 100644
--- a/l10n/th_TH/tasks.po
+++ b/l10n/th_TH/tasks.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 15:26+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"
@@ -19,88 +20,88 @@ msgstr ""
#: ajax/update_property.php:51 lib/app.php:89 lib/app.php:101
msgid "Invalid date/time"
-msgstr ""
+msgstr "วันที่ / เวลา ไม่ถูกต้อง"
#: appinfo/app.php:11
msgid "Tasks"
-msgstr ""
+msgstr "งาน"
#: js/tasks.js:415
msgid "No category"
-msgstr ""
+msgstr "ไม่มีหมวดหมู่"
#: lib/app.php:33
msgid "Unspecified"
-msgstr ""
+msgstr "ยังไม่ได้ระบุ"
#: lib/app.php:34
msgid "1=highest"
-msgstr ""
+msgstr "1=สูงสุด"
#: lib/app.php:38
msgid "5=medium"
-msgstr ""
+msgstr "5=ปานกลาง"
#: lib/app.php:42
msgid "9=lowest"
-msgstr ""
+msgstr "9=ต่ำสุด"
#: lib/app.php:81
msgid "Empty Summary"
-msgstr ""
+msgstr "ข้อมูลสรุปยังว่างอยู่"
#: lib/app.php:93
msgid "Invalid percent complete"
-msgstr ""
+msgstr "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง"
#: lib/app.php:107
msgid "Invalid priority"
-msgstr ""
+msgstr "ความสำคัญไม่ถูกต้อง"
#: templates/tasks.php:3
msgid "Add Task"
-msgstr ""
+msgstr "เพิ่มงานใหม่"
#: templates/tasks.php:4
msgid "Order Due"
-msgstr ""
+msgstr "จัดเรียงตามกำหนดเวลา"
#: templates/tasks.php:5
msgid "Order List"
-msgstr ""
+msgstr "จัดเรียงตามรายชื่อ"
#: templates/tasks.php:6
msgid "Order Complete"
-msgstr ""
+msgstr "จัดเรียงตามความสมบูรณ์"
#: templates/tasks.php:7
msgid "Order Location"
-msgstr ""
+msgstr "จัดเรียงตามตำแหน่งที่อยู่"
#: templates/tasks.php:8
msgid "Order Priority"
-msgstr ""
+msgstr "จัดเรียงตามระดับความสำคัญ"
#: templates/tasks.php:9
msgid "Order Label"
-msgstr ""
+msgstr "จัดเรียงตามป้ายชื่อ"
#: templates/tasks.php:16
msgid "Loading tasks..."
-msgstr ""
+msgstr "กำลังโหลดข้อมูลงาน..."
#: templates/tasks.php:20
msgid "Important"
-msgstr ""
+msgstr "สำคัญ"
#: templates/tasks.php:23
msgid "More"
-msgstr ""
+msgstr "มาก"
#: templates/tasks.php:26
msgid "Less"
-msgstr ""
+msgstr "น้อย"
#: templates/tasks.php:29
msgid "Delete"
-msgstr ""
+msgstr "ลบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 6303056f2a9..d4e8110d114 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-20 02:01+0200\n"
+"PO-Revision-Date: 2012-08-19 16:00+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"
@@ -19,103 +20,103 @@ msgstr ""
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "โฮสต์"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "DN ฐาน"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "DN ของผู้ใช้งาน"
#: templates/settings.php:10
msgid ""
"The DN of the client user with which the bind shall be done, e.g. "
"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
"empty."
-msgstr ""
+msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "รหัสผ่าน"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "ตัวกรองข้อมูลกลุ่ม"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "พอร์ต"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "รายการผู้ใช้งานหลักแบบ Tree"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "รายการกลุ่มหลักแบบ Tree"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "ใช้ TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว"
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
@@ -123,42 +124,42 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "ในหน่วยไบต์"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
#: templates/settings.php:31
msgid "Help"
-msgstr ""
+msgstr "ช่วยเหลือ"
diff --git a/l10n/th_TH/user_migrate.po b/l10n/th_TH/user_migrate.po
index 676ffdfbb5b..74a5aec4843 100644
--- a/l10n/th_TH/user_migrate.po
+++ b/l10n/th_TH/user_migrate.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:37+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"
@@ -19,33 +20,33 @@ msgstr ""
#: js/export.js:14 js/export.js:20
msgid "Export"
-msgstr ""
+msgstr "ส่งออก"
#: js/export.js:19
msgid "Something went wrong while the export file was being generated"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดบางประการในระหว่างการส่งออกไฟล์"
#: js/export.js:19
msgid "An error has occurred"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดบางประการ"
#: templates/settings.php:2
msgid "Export your user account"
-msgstr ""
+msgstr "ส่งออกบัญชีผู้ใช้งานของคุณ"
#: templates/settings.php:3
msgid ""
"This will create a compressed file that contains your ownCloud account."
-msgstr ""
+msgstr "ส่วนนี้จะเป็นการสร้างไฟล์บีบอัดที่บรรจุข้อมูลบัญชีผู้ใช้งาน ownCloud ของคุณ"
#: templates/settings.php:13
msgid "Import user account"
-msgstr ""
+msgstr "นำเข้าบัญชีผู้ใช้งาน"
#: templates/settings.php:15
msgid "ownCloud User Zip"
-msgstr ""
+msgstr "ไฟล์ Zip ผู้ใช้งาน ownCloud"
#: templates/settings.php:17
msgid "Import"
-msgstr ""
+msgstr "นำเข้า"
diff --git a/l10n/th_TH/user_openid.po b/l10n/th_TH/user_openid.po
index 9b4a609ba16..7ed74e306ba 100644
--- a/l10n/th_TH/user_openid.po
+++ b/l10n/th_TH/user_openid.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# AriesAnywhere Anywhere <ariesanywhere@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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-15 02:03+0200\n"
+"PO-Revision-Date: 2012-08-14 13:32+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,36 +20,36 @@ msgstr ""
#: templates/nomode.php:12
msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "นี่คือปลายทางของเซิร์ฟเวอร์ OpenID สำหรับรายละเอียดเพิ่มเติม, กรุณาดูที่"
#: templates/nomode.php:14
msgid "Identity: <b>"
-msgstr ""
+msgstr "ข้อมูลประจำตัว <b>"
#: templates/nomode.php:15
msgid "Realm: <b>"
-msgstr ""
+msgstr "ขอบเขตพื้นที่ <b>"
#: templates/nomode.php:16
msgid "User: <b>"
-msgstr ""
+msgstr "ผู้ใช้งาน: <b>"
#: templates/nomode.php:17
msgid "Login"
-msgstr ""
+msgstr "เข้าสู่ระบบ"
#: templates/nomode.php:22
msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "พบข้อผิดพลาด <b> ยังไม่ได้เลือกชื่อผู้ใช้งาน"
#: templates/settings.php:4
msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "คุณสามารถได้รับสิทธิ์เพื่อเข้าใช้งานเว็บไซต์อื่นๆโดยใช้ที่อยู่นี้"
#: templates/settings.php:5
msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "ผู้ให้บริการ OpenID ที่ได้รับอนุญาต"
#: templates/settings.php:6
msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "ที่อยู่ของคุณที่ Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 79c0485eddc..bcf5ad88c3e 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "Geçerli bir adres alınamadı."
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "Hata"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "Sonuç: "
@@ -812,11 +816,11 @@ msgstr "Adres defterini yapılandır"
msgid "Select Address Books"
msgstr "Adres deftelerini seçiniz"
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr "İsim giriniz"
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr "Tanım giriniz"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 1ea3973f522..f2a34211a79 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -229,8 +229,8 @@ msgid "Other"
msgstr "Diğer"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "Alt Yönetici"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 3cb6c2aa249..a9c12c6def1 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index e779674bc42..f32d1abccf9 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr ""
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 3568844e5b6..5533bf5bc52 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +240,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -287,6 +287,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -810,11 +814,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 3cf80bee1c5..41c0adc6ef3 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -228,7 +228,7 @@ msgid "Other"
msgstr "Khác"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/l10n/zh_CN.GB2312/contacts.po b/l10n/zh_CN.GB2312/contacts.po
index 8a348956c14..fc13248c053 100644
--- a/l10n/zh_CN.GB2312/contacts.po
+++ b/l10n/zh_CN.GB2312/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -239,8 +239,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -286,6 +286,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -809,11 +813,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index b451fb6d414..70f3d9d228b 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,8 +227,8 @@ msgid "Other"
msgstr "其他的"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr "子专辑"
+msgid "Group Admin"
+msgstr ""
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 0c73f885ca4..f863dd7a043 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -242,8 +242,8 @@ msgstr "无法获取一个合法的地址。"
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr "错误"
@@ -289,6 +289,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr "结果: "
@@ -812,11 +816,11 @@ msgstr "配置地址簿"
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 2c675317223..981e62bfb4c 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <rainofchaos@gmail.com>, 2012.
# <wengxt@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:47+0000\n"
+"Last-Translator: leonfeng <rainofchaos@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"
@@ -54,7 +55,7 @@ msgstr "文件"
#: js/fileactions.js:95
msgid "Unshare"
-msgstr ""
+msgstr "取消共享"
#: js/fileactions.js:97 templates/index.php:56
msgid "Delete"
@@ -62,19 +63,19 @@ msgstr "删除"
#: js/filelist.js:141
msgid "already exists"
-msgstr ""
+msgstr "已经存在"
#: js/filelist.js:141
msgid "replace"
-msgstr ""
+msgstr "替换"
#: js/filelist.js:141
msgid "cancel"
-msgstr ""
+msgstr "取消"
#: js/filelist.js:195
msgid "replaced"
-msgstr ""
+msgstr "已经替换"
#: js/filelist.js:195
msgid "with"
@@ -82,11 +83,11 @@ msgstr ""
#: js/filelist.js:195 js/filelist.js:256
msgid "undo"
-msgstr ""
+msgstr "撤销"
#: js/filelist.js:256
msgid "deleted"
-msgstr ""
+msgstr "已经删除"
#: js/files.js:170
msgid "generating ZIP-file, it may take some time."
@@ -112,27 +113,27 @@ msgstr "上传已取消"
msgid "Invalid name, '/' is not allowed."
msgstr "非法的名称,不允许使用‘/’。"
-#: js/files.js:631 templates/index.php:55
+#: js/files.js:694 templates/index.php:55
msgid "Size"
msgstr "大小"
-#: js/files.js:632 templates/index.php:56
+#: js/files.js:695 templates/index.php:56
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:659
+#: js/files.js:722
msgid "folder"
msgstr "文件夹"
-#: js/files.js:661
+#: js/files.js:724
msgid "folders"
msgstr "文件夹"
-#: js/files.js:669
+#: js/files.js:732
msgid "file"
msgstr "文件"
-#: js/files.js:671
+#: js/files.js:734
msgid "files"
msgstr "文件"
diff --git a/l10n/zh_CN/gallery.po b/l10n/zh_CN/gallery.po
index 23d106c760e..e268331a6e8 100644
--- a/l10n/zh_CN/gallery.po
+++ b/l10n/zh_CN/gallery.po
@@ -4,93 +4,38 @@
#
# Translators:
# Bartek <bart.p.pl@gmail.com>, 2012.
+# <rainofchaos@gmail.com>, 2012.
# <wengxt@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:15+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/language/zh_CN/)\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:50+0000\n"
+"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: appinfo/app.php:37
+#: appinfo/app.php:39
msgid "Pictures"
msgstr "图片"
-#: js/album_cover.js:44
+#: js/pictures.js:12
msgid "Share gallery"
-msgstr ""
+msgstr "分享图库"
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
msgid "Error: "
-msgstr ""
+msgstr "错误:"
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
msgid "Internal error"
-msgstr ""
-
-#: js/album_cover.js:114
-msgid "Scanning root"
-msgstr ""
-
-#: js/album_cover.js:115
-msgid "Default order"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Ascending"
-msgstr ""
-
-#: js/album_cover.js:116
-msgid "Descending"
-msgstr ""
-
-#: js/album_cover.js:117 templates/index.php:19
-msgid "Settings"
-msgstr "设置"
-
-#: js/album_cover.js:122
-msgid "Scanning root cannot be empty"
-msgstr ""
-
-#: js/album_cover.js:122 js/album_cover.js:133
-msgid "Error"
-msgstr ""
-
-#: templates/index.php:16
-msgid "Rescan"
-msgstr "重新扫描"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "停止"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "分享"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "返回"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "移除确认"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "您是否想要移除相册"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "修改相册名称"
+msgstr "内部错误"
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "新相册名称"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "幻灯片"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 14d709456d8..7dffc01ef6a 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-19 02:02+0200\n"
+"PO-Revision-Date: 2012-08-18 05:49+0000\n"
+"Last-Translator: leonfeng <rainofchaos@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"
@@ -22,7 +22,7 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "无法从应用商店载入列表"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -42,7 +42,7 @@ msgstr "非法请求"
#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "认证错误"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -50,7 +50,7 @@ msgstr "语言已修改"
#: js/apps.js:18
msgid "Error"
-msgstr ""
+msgstr "错误"
#: js/apps.js:39 js/apps.js:73
msgid "Disable"
@@ -70,15 +70,15 @@ msgstr "简体中文"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "安全警告"
#: templates/admin.php:29
msgid "Cron"
-msgstr ""
+msgstr "计划任务"
#: templates/admin.php:31
msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "为每个装入的页面执行任务"
#: templates/admin.php:33
msgid "cron.php is registered at a webcron service"
@@ -86,7 +86,7 @@ msgstr ""
#: templates/admin.php:35
msgid "use systems cron service"
-msgstr ""
+msgstr "实现系统 cron 服务"
#: templates/admin.php:39
msgid "Log"
@@ -229,8 +229,8 @@ msgid "Other"
msgstr "其它"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
-msgstr ""
+msgid "Group Admin"
+msgstr "组管理"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index d3df1f28104..98be89a1619 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.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-08-11 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-16 02:04+0200\n"
+"PO-Revision-Date: 2012-08-16 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -241,8 +241,8 @@ msgstr ""
#: js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
-#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1452
-#: js/settings.js:25 js/settings.js:42 js/settings.js:67
+#: js/contacts.js:1284 js/contacts.js:1421 js/contacts.js:1456
+#: js/contacts.js:1476 js/settings.js:25 js/settings.js:42 js/settings.js:67
msgid "Error"
msgstr ""
@@ -288,6 +288,10 @@ msgid ""
"them to be deleted."
msgstr ""
+#: js/contacts.js:1461
+msgid "Do you want to merge these address books?"
+msgstr ""
+
#: js/loader.js:49
msgid "Result: "
msgstr ""
@@ -811,11 +815,11 @@ msgstr ""
msgid "Select Address Books"
msgstr ""
-#: templates/part.selectaddressbook.php:20
+#: templates/part.selectaddressbook.php:27
msgid "Enter name"
msgstr ""
-#: templates/part.selectaddressbook.php:22
+#: templates/part.selectaddressbook.php:29
msgid "Enter description"
msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 890940b3971..49d33a61537 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 00:03+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-18 02:01+0200\n"
+"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid "Other"
msgstr "其他"
#: templates/users.php:80 templates/users.php:112
-msgid "SubAdmin"
+msgid "Group Admin"
msgstr ""
#: templates/users.php:82
diff --git a/lib/archive.php b/lib/archive.php
index 113f92e9604..fabd7cc7a51 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -112,4 +112,25 @@ abstract class OC_Archive{
* @return resource
*/
abstract function getStream($path,$mode);
+ /**
+ * add a folder and all it's content
+ * @param string $path
+ * @param string source
+ * @return bool
+ */
+ function addRecursive($path,$source){
+ if($dh=opendir($source)){
+ $this->addFolder($path);
+ while($file=readdir($dh)){
+ if($file=='.' or $file=='..'){
+ continue;
+ }
+ if(is_dir($source.'/'.$file)){
+ $this->addRecursive($path.'/'.$file,$source.'/'.$file);
+ }else{
+ $this->addFile($path.'/'.$file,$source.'/'.$file);
+ }
+ }
+ }
+ }
}
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 944a0ac4ba4..f6efd6d0ecc 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -56,14 +56,21 @@ class OC_Archive_TAR extends OC_Archive{
* @return bool
*/
function addFolder($path){
- $tmpBase=get_temp_dir().'/';
+ $tmpBase=OC_Helper::tmpFolder();
if(substr($path,-1,1)!='/'){
$path.='/';
}
if($this->fileExists($path)){
return false;
}
- mkdir($tmpBase.$path);
+ $parts=explode('/',$path);
+ $folder=$tmpBase;
+ foreach($parts as $part){
+ $folder.='/'.$part;
+ if(!is_dir($folder)){
+ mkdir($folder);
+ }
+ }
$result=$this->tar->addModify(array($tmpBase.$path),'',$tmpBase);
rmdir($tmpBase.$path);
$this->fileList=false;
@@ -79,7 +86,7 @@ class OC_Archive_TAR extends OC_Archive{
if($this->fileExists($path)){
$this->remove($path);
}
- if(file_exists($source)){
+ if($source and $source[0]=='/' and file_exists($source)){
$header=array();
$dummy='';
$this->tar->_openAppend();
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index b2d6674d639..c1a5c35738b 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -36,7 +36,7 @@ class OC_Archive_ZIP extends OC_Archive{
* @return bool
*/
function addFile($path,$source=''){
- if(file_exists($source)){
+ if($source and $source[0]=='/' and file_exists($source)){
$result=$this->zip->addFile($source,$path);
}else{
$result=$this->zip->addFromString($path,$source);
diff --git a/lib/files.php b/lib/files.php
index 07d432f8066..ce7cf2c4466 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -33,6 +33,10 @@ class OC_Files {
* @param dir $directory path under datadirectory
*/
public static function getDirectoryContent($directory, $mimetype_filter = ''){
+ $directory=OC_Filesystem::normalizePath($directory);
+ if($directory=='/'){
+ $directory='';
+ }
$files = array();
if (substr($directory, 0, 7) == '/Shared') {
if ($directory == '/Shared') {
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 5d864b5d7bb..5bfd09253d5 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -53,6 +53,7 @@ abstract class OC_Filestorage{
abstract public function search($query);
abstract public function touch($path, $mtime=null);
abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
+ abstract public function getLocalFolder($path);// get a path to a local version of the folder, whether the original file is local or remote
/**
* check if a file or folder has been updated since $time
* @param int $time
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 00c76796c57..c829be62f74 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -232,6 +232,26 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
OC_Helper::streamCopy($source,$target);
return $tmpFile;
}
+ public function getLocalFolder($path){
+ $baseDir=OC_Helper::tmpFolder();
+ $this->addLocalFolder($path,$baseDir);
+ return $baseDir;
+ }
+ private function addLocalFolder($path,$target){
+ if($dh=$this->opendir($path)){
+ while($file=readdir($dh)){
+ if($file!=='.' and $file!=='..'){
+ if($this->is_dir($path.'/'.$file)){
+ mkdir($target.'/'.$file);
+ $this->addLocalFolder($path.'/'.$file,$target.'/'.$file);
+ }else{
+ $tmp=$this->toTmpFile($path.'/'.$file);
+ rename($tmp,$target.'/'.$file);
+ }
+ }
+ }
+ }
+ }
// abstract public function touch($path, $mtime=null);
protected function searchInDir($query,$dir=''){
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 94b3147b73b..22d17469df3 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -168,7 +168,10 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
return $this->searchInDir($query);
}
public function getLocalFile($path){
- return $this->datadir.$path;
+ return $this->datadir.$path;
+ }
+ public function getLocalFolder($path){
+ return $this->datadir.$path;
}
protected function searchInDir($query,$dir=''){
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 2eeb044ddba..82fbf11afdf 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -336,6 +336,13 @@ class OC_Filesystem{
static public function getLocalFile($path){
return self::$defaultInstance->getLocalFile($path);
}
+ /**
+ * @param string path
+ * @return string
+ */
+ static public function getLocalFolder($path){
+ return self::$defaultInstance->getLocalFolder($path);
+ }
/**
* return path to file which reflects one visible in browser
@@ -516,7 +523,16 @@ class OC_Filesystem{
OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
}
- public static function normalizePath($path){
+ /**
+ * normalize a path
+ * @param string path
+ * @param bool $stripTrailingSlash
+ * @return string
+ */
+ public static function normalizePath($path,$stripTrailingSlash=true){
+ if($path==''){
+ return '/';
+ }
//no windows style slashes
$path=str_replace('\\','/',$path);
//add leading slash
@@ -524,7 +540,7 @@ class OC_Filesystem{
$path='/'.$path;
}
//remove trainling slash
- if(strlen($path)>1 and substr($path,-1,1)==='/'){
+ if($stripTrailingSlash and strlen($path)>1 and substr($path,-1,1)==='/'){
$path=substr($path,0,-1);
}
//remove duplicate slashes
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index df1ece0bafc..a888e5340ea 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -54,7 +54,7 @@ class OC_FilesystemView {
if($path[0]!=='/'){
$path='/'.$path;
}
- return OC_Filesystem::normalizePath($this->fakeRoot.$path);
+ return $this->fakeRoot.$path;
}
/**
@@ -147,6 +147,16 @@ class OC_FilesystemView {
return $storage->getLocalFile($this->getInternalPath($path));
}
}
+ /**
+ * @param string path
+ * @return string
+ */
+ public function getLocalFolder($path) {
+ $parent=substr($path, 0, strrpos($path,'/'));
+ if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)) {
+ return $storage->getLocalFolder($this->getInternalPath($path));
+ }
+ }
/**
* the following functions operate with arguments and return values identical
@@ -248,7 +258,7 @@ class OC_FilesystemView {
}
public function file_put_contents($path, $data) {
if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier
- $absolutePath = $this->getAbsolutePath($path);
+ $absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path));
if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) && OC_Filesystem::isValidPath($path)) {
$path = $this->getRelativePath($absolutePath);
$exists = $this->file_exists($path);
@@ -308,11 +318,14 @@ class OC_FilesystemView {
return $this->basicOperation( 'deleteAll', $directory, array('delete'), $empty );
}
public function rename($path1, $path2) {
- $absolutePath1 = $this->getAbsolutePath($path1);
- $absolutePath2 = $this->getAbsolutePath($path2);
+ $postFix1=(substr($path1,-1,1)==='/')?'/':'';
+ $postFix2=(substr($path2,-1,1)==='/')?'/':'';
+ $absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1));
+ $absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2));
if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
$path1 = $this->getRelativePath($absolutePath1);
$path2 = $this->getRelativePath($absolutePath2);
+
if($path1 == null or $path2 == null) {
return false;
}
@@ -326,20 +339,20 @@ class OC_FilesystemView {
)
);
if($run) {
- $mp1 = $this->getMountPoint($path1);
- $mp2 = $this->getMountPoint($path2);
+ $mp1 = $this->getMountPoint($path1.$postFix1);
+ $mp2 = $this->getMountPoint($path2.$postFix2);
if($mp1 == $mp2) {
if($storage = $this->getStorage($path1)) {
- $result = $storage->rename($this->getInternalPath($path1), $this->getInternalPath($path2));
+ $result = $storage->rename($this->getInternalPath($path1.$postFix1), $this->getInternalPath($path2.$postFix2));
}
} else {
- $source = $this->fopen($path1, 'r');
- $target = $this->fopen($path2, 'w');
+ $source = $this->fopen($path1.$postFix1, 'r');
+ $target = $this->fopen($path2.$postFix2, 'w');
$count = OC_Helper::streamCopy($source, $target);
$storage1 = $this->getStorage($path1);
- $storage1->unlink($this->getInternalPath($path1));
+ $storage1->unlink($this->getInternalPath($path1.$postFix1));
$result = $count>0;
- }
+ }
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_post_rename,
@@ -353,11 +366,14 @@ class OC_FilesystemView {
}
}
public function copy($path1, $path2) {
- $absolutePath1 = $this->getAbsolutePath($path1);
- $absolutePath2 = $this->getAbsolutePath($path2);
+ $postFix1=(substr($path1,-1,1)==='/')?'/':'';
+ $postFix2=(substr($path2,-1,1)==='/')?'/':'';
+ $absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1));
+ $absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2));
if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
$path1 = $this->getRelativePath($absolutePath1);
$path2 = $this->getRelativePath($absolutePath2);
+
if($path1 == null or $path2 == null) {
return false;
}
@@ -393,15 +409,15 @@ class OC_FilesystemView {
);
}
if($run) {
- $mp1=$this->getMountPoint($path1);
- $mp2=$this->getMountPoint($path2);
+ $mp1=$this->getMountPoint($path1.$postFix1);
+ $mp2=$this->getMountPoint($path2.$postFix2);
if($mp1 == $mp2){
- if($storage = $this->getStorage($path1)) {
- $result=$storage->copy($this->getInternalPath($path1), $this->getInternalPath($path2));
+ if($storage = $this->getStorage($path1.$postFix1)) {
+ $result=$storage->copy($this->getInternalPath($path1.$postFix1), $this->getInternalPath($path2.$postFix2));
}
} else {
- $source = $this->fopen($path1, 'r');
- $target = $this->fopen($path2, 'w');
+ $source = $this->fopen($path1.$postFix1, 'r');
+ $target = $this->fopen($path2.$postFix2, 'w');
$result = OC_Helper::streamCopy($source, $target);
}
OC_Hook::emit(
@@ -496,7 +512,8 @@ class OC_FilesystemView {
return $this->basicOperation('getMimeType', $path);
}
public function hash($type, $path, $raw = false) {
- $absolutePath = $this->getAbsolutePath($path);
+ $postFix=(substr($path,-1,1)==='/')?'/':'';
+ $absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path));
if (OC_FileProxy::runPreProxies('hash', $absolutePath) && OC_Filesystem::isValidPath($path)) {
$path = $this->getRelativePath($absolutePath);
if ($path == null) {
@@ -509,8 +526,8 @@ class OC_FilesystemView {
array( OC_Filesystem::signal_param_path => $path)
);
}
- if ($storage = $this->getStorage($path)) {
- $result = $storage->hash($type, $this->getInternalPath($path), $raw);
+ if ($storage = $this->getStorage($path.$postFix)) {
+ $result = $storage->hash($type, $this->getInternalPath($path.$postFix), $raw);
$result = OC_FileProxy::runPostProxies('hash', $absolutePath, $result);
return $result;
}
@@ -535,35 +552,16 @@ class OC_FilesystemView {
* OC_Filestorage for delegation to a storage backend for execution
*/
private function basicOperation($operation, $path, $hooks=array(), $extraParam=null) {
- $absolutePath = $this->getAbsolutePath($path);
+ $postFix=(substr($path,-1,1)==='/')?'/':'';
+ $absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path));
if(OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and OC_Filesystem::isValidPath($path)) {
$path = $this->getRelativePath($absolutePath);
if($path == null) {
return false;
}
- $internalPath = $this->getInternalPath($path);
- $run = true;
- if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
- foreach($hooks as $hook) {
- if($hook!='read') {
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- $hook,
- array(
- OC_Filesystem::signal_param_path => $path,
- OC_Filesystem::signal_param_run => &$run
- )
- );
- } else {
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- $hook,
- array( OC_Filesystem::signal_param_path => $path)
- );
- }
- }
- }
- if($run and $storage = $this->getStorage($path)) {
+ $internalPath = $this->getInternalPath($path.$postFix);
+ $run=$this->runHooks($hooks,$path);
+ if($run and $storage = $this->getStorage($path.$postFix)) {
if(!is_null($extraParam)) {
$result = $storage->$operation($internalPath, $extraParam);
} else {
@@ -572,15 +570,7 @@ class OC_FilesystemView {
$result = OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
if($operation!='fopen') {//no post hooks for fopen, the file stream is still open
- foreach($hooks as $hook) {
- if($hook!='read'){
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- 'post_'.$hook,
- array( OC_Filesystem::signal_param_path => $path)
- );
- }
- }
+ $this->runHooks($hooks,$path,true);
}
}
return $result;
@@ -589,6 +579,34 @@ class OC_FilesystemView {
return null;
}
+ private function runHooks($hooks,$path,$post=false){
+ $prefix=($post)?'post_':'';
+ $run=true;
+ if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
+ foreach($hooks as $hook) {
+ if($hook!='read') {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ $prefix.$hook,
+ array(
+ OC_Filesystem::signal_param_run => &$run,
+ OC_Filesystem::signal_param_path => $path
+ )
+ );
+ } elseif(!$post) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ $prefix.$hook,
+ array(
+ OC_Filesystem::signal_param_path => $path
+ )
+ );
+ }
+ }
+ }
+ return $run;
+ }
+
/**
* check if a file or folder has been updated since $time
* @param int $time
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
new file mode 100644
index 00000000000..933dbe541f5
--- /dev/null
+++ b/lib/l10n/cs_CZ.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Nápověda",
+"Personal" => "Osobní",
+"Settings" => "Nastavení",
+"Users" => "Uživatelé",
+"Apps" => "Aplikace",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Stahování ZIPu je vypnuto.",
+"Files need to be downloaded one by one." => "Soubory je nutno stahovat samostatně.",
+"Back to Files" => "Zpět k souborům",
+"Selected files too large to generate zip file." => "Vybarné soubory jsou pro vytvoření zipu příliš velké.",
+"Application is not enabled" => "Aplikace není povolena",
+"Authentication error" => "Chyba autorizace",
+"Token expired. Please reload page." => "Realce expirovala. Obnovte prosím stranu.",
+"seconds ago" => "před vteřinami",
+"1 minute ago" => "před 1 minutou",
+"%d minutes ago" => "před %d minutami",
+"today" => "dnes",
+"yesterday" => "včera",
+"%d days ago" => "před %d dny",
+"last month" => "minulý měsíc",
+"months ago" => "před měsíci",
+"last year" => "loni",
+"years ago" => "před lety"
+);
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 7889335d975..cec9945b1b3 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -12,11 +12,14 @@
"Application is not enabled" => "Aplikacija ni omogočena",
"Authentication error" => "Napaka overitve",
"Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
+"seconds ago" => "sekundami",
"1 minute ago" => "pred minuto",
"%d minutes ago" => "pred %d minutami",
"today" => "danes",
"yesterday" => "včeraj",
"%d days ago" => "pred %d dnevi",
"last month" => "prejšnji mesec",
-"last year" => "lani"
+"months ago" => "meseci",
+"last year" => "lani",
+"years ago" => "leti"
);
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
new file mode 100644
index 00000000000..cb2610fa204
--- /dev/null
+++ b/lib/l10n/th_TH.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ช่วยเหลือ",
+"Personal" => "ส่วนตัว",
+"Settings" => "ตั้งค่า",
+"Users" => "ผู้ใช้งาน",
+"Apps" => "แอปฯ",
+"Admin" => "ผู้ดูแล",
+"ZIP download is turned off." => "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้",
+"Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
+"Back to Files" => "กลับไปที่ไฟล์",
+"Selected files too large to generate zip file." => "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip",
+"Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
+"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+"Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
+"seconds ago" => "วินาทีที่ผ่านมา",
+"1 minute ago" => "1 นาทีมาแล้ว",
+"%d minutes ago" => "%d นาทีที่ผ่านมา",
+"today" => "วันนี้",
+"yesterday" => "เมื่อวานนี้",
+"%d days ago" => "%d วันที่ผ่านมา",
+"last month" => "เดือนที่แล้ว",
+"months ago" => "เดือนมาแล้ว",
+"last year" => "ปีที่แล้ว",
+"years ago" => "ปีที่ผ่านมา"
+);
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 37d50756d57..8386bcb93f3 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -93,4 +93,5 @@ return array(
'pptx'=>'application/mspowerpoint',
'sgf' => 'application/sgf',
'cdr' => 'application/coreldraw',
+ 'impress' => 'text/impress',
);
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 5a326c125f6..082f1cfb922 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -35,7 +35,7 @@ if(is_array($catagoryNames)){
// show only external apps that aren't enabled yet
$local=false;
foreach($enabledApps as $a){
- if($a['name'] == $app['name']) {
+ if($a == $app['name']) {
$local=true;
}
}
diff --git a/settings/img/admin.png b/settings/img/admin.png
index c1e6d6b8a7f..13d653f92a8 100644
--- a/settings/img/admin.png
+++ b/settings/img/admin.png
Binary files differ
diff --git a/settings/img/apps.png b/settings/img/apps.png
index 17f47d632b9..e9845d012be 100644
--- a/settings/img/apps.png
+++ b/settings/img/apps.png
Binary files differ
diff --git a/settings/img/help.png b/settings/img/help.png
index 2257d144d11..37ccb356830 100644
--- a/settings/img/help.png
+++ b/settings/img/help.png
Binary files differ
diff --git a/settings/img/log.png b/settings/img/log.png
index c84b3b29f19..b34a58f844c 100644
--- a/settings/img/log.png
+++ b/settings/img/log.png
Binary files differ
diff --git a/settings/img/personal.png b/settings/img/personal.png
index 8204028f70e..8edc5a16cd6 100644
--- a/settings/img/personal.png
+++ b/settings/img/personal.png
Binary files differ
diff --git a/settings/img/users.png b/settings/img/users.png
index f56e2442c9e..79ad3d667e1 100644
--- a/settings/img/users.png
+++ b/settings/img/users.png
Binary files differ
diff --git a/settings/js/users.js b/settings/js/users.js
index 29f70f24dff..bf0bd108640 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -73,7 +73,7 @@ UserList={
groupsSelect.data('userGroups', 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', 'SubAdmin') + '">');
+ var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
subadminSelect.data('username', username);
subadminSelect.data('userGroups', groups);
subadminSelect.data('subadmin', subadmin);
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index aa9d73df429..dcc592f5139 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -13,9 +13,12 @@
"__language_name__" => "Català",
"Security Warning" => "Avís de seguretat",
"Cron" => "Cron",
+"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
+"cron.php is registered at a webcron service" => "cron.php està registrat en un servei web cron",
+"use systems cron service" => "usa el servei cron del sistema",
"Log" => "Registre",
"More" => "Més",
-"Add your App" => "Afegeiu la vostra aplicació",
+"Add your App" => "Afegiu la vostra aplicació",
"Select an App" => "Seleccioneu una aplicació",
"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
"-licensed" => "- amb llicència",
@@ -48,7 +51,6 @@
"Create" => "Crea",
"Default Quota" => "Quota per defecte",
"Other" => "Altre",
-"SubAdmin" => "SubAdmin",
"Quota" => "Quota",
"Delete" => "Suprimeix"
);
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index d71ae497d33..ed7378b80c4 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,13 +1,21 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nepodařílo se stáhnout seznam z App Store",
"Email saved" => "E-mail uložen",
"Invalid email" => "Neplatný e-mail",
"OpenID Changed" => "OpenID změněn",
"Invalid request" => "Chybný dotaz",
+"Authentication error" => "Chyba autorizace",
"Language changed" => "Jazyk byl změněn",
+"Error" => "Chyba",
"Disable" => "Vypnout",
"Enable" => "Zapnout",
"Saving..." => "Ukládám...",
"__language_name__" => "Česky",
+"Security Warning" => "Bezpečnostní upozornění",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "spustit jednu úlohu s každou nataženou stranou",
+"cron.php is registered at a webcron service" => "cron.php je registrován jako služba webcron",
+"use systems cron service" => "použijte systémovou službu cron",
"Log" => "Log",
"More" => "Více",
"Add your App" => "Přidat vaší aplikaci",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 569abd58cba..c2c0d7a8267 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -47,7 +47,6 @@
"Create" => "Ny",
"Default Quota" => "Standard kvote",
"Other" => "Andet",
-"SubAdmin" => "SubAdmin",
"Quota" => "Kvote",
"Delete" => "Slet"
);
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 8c6296d3fb8..be9704336f7 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -12,6 +12,10 @@
"Saving..." => "Speichern...",
"__language_name__" => "Deutsch",
"Security Warning" => "Sicherheitshinweis",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
+"cron.php is registered at a webcron service" => "cron.php ist beim Webcron-Service registriert",
+"use systems cron service" => "Nutze System-Cron-Service",
"Log" => "Log",
"More" => "Mehr",
"Add your App" => "Füge deine App hinzu",
@@ -47,7 +51,7 @@
"Create" => "Anlegen",
"Default Quota" => "Standard Quota",
"Other" => "Andere",
-"SubAdmin" => "Unteradministrator",
+"Group Admin" => "Gruppenadministrator",
"Quota" => "Quota",
"Delete" => "Löschen"
);
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index c0ab65a81a2..051783701cb 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,15 +1,21 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
"Email saved" => "Το Email αποθηκεύτηκε ",
"Invalid email" => "Μη έγκυρο email",
"OpenID Changed" => "Το OpenID άλλαξε",
"Invalid request" => "Μη έγκυρο αίτημα",
"Authentication error" => "Σφάλμα πιστοποίησης",
"Language changed" => "Η γλώσσα άλλαξε",
+"Error" => "Σφάλμα",
"Disable" => "Απενεργοποίηση",
"Enable" => "Ενεργοποίηση",
"Saving..." => "Αποθήκευση...",
"__language_name__" => "__όνομα_γλώσσας__",
"Security Warning" => "Προειδοποίηση Ασφαλείας",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται",
+"cron.php is registered at a webcron service" => "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία",
+"use systems cron service" => "Χρήση της υπηρεσίας cron του συστήματος",
"Log" => "Αρχείο καταγραφής",
"More" => "Περισσότερο",
"Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
@@ -45,7 +51,6 @@
"Create" => "Δημιουργία",
"Default Quota" => "Προεπιλεγμένο όριο",
"Other" => "Άλλα",
-"SubAdmin" => "SubAdmin",
"Quota" => "Σύνολο χώρου",
"Delete" => "Διαγραφή"
);
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 55a7482d249..c0ad6ef1051 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -12,7 +12,11 @@
"Saving..." => "Konservante...",
"__language_name__" => "Esperanto",
"Security Warning" => "Sekureca averto",
-"Log" => "Registro",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
+"cron.php is registered at a webcron service" => "cron.php estas registrita kiel webcron-servilo",
+"use systems cron service" => "uzi la cron-servon de la sistemo",
+"Log" => "Protokolo",
"More" => "Pli",
"Add your App" => "Aldonu vian aplikaĵon",
"Select an App" => "Elekti aplikaĵon",
@@ -47,7 +51,7 @@
"Create" => "Krei",
"Default Quota" => "Defaŭlta kvoto",
"Other" => "Alia",
-"SubAdmin" => "Subadministranto",
+"Group Admin" => "Grupadministranto",
"Quota" => "Kvoto",
"Delete" => "Forigi"
);
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 8da36b421a3..5f2eaf2e251 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -12,6 +12,10 @@
"Saving..." => "Salvando..",
"__language_name__" => "Castellano",
"Security Warning" => "Advertencia de seguridad",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ejecutar una tarea con cada página cargada",
+"cron.php is registered at a webcron service" => "cron.php se registra en un servicio webcron",
+"use systems cron service" => "usar servicio cron del sistema",
"Log" => "Registro",
"More" => "Más",
"Add your App" => "Añade tu aplicación",
@@ -47,7 +51,6 @@
"Create" => "Crear",
"Default Quota" => "Cuota predeterminada",
"Other" => "Otro",
-"SubAdmin" => "SubAdmin",
"Quota" => "Cuota",
"Delete" => "Eliminar"
);
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 009cd1a8a89..1ead8b14b6f 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -45,7 +45,6 @@
"Create" => "Sortu",
"Default Quota" => "Kuota lehentsia",
"Other" => "Besteak",
-"SubAdmin" => "SubAdmin",
"Quota" => "Kuota",
"Delete" => "Ezabatu"
);
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 81d1b9d0e61..9cc36f49551 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -11,6 +11,8 @@
"Saving..." => "Tallennetaan...",
"__language_name__" => "_kielen_nimi_",
"Security Warning" => "Turvallisuusvaroitus",
+"Cron" => "Cron",
+"use systems cron service" => "käytä järjestelmän cron-palvelua",
"Log" => "Loki",
"More" => "Lisää",
"Add your App" => "Lisää ohjelmasi",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 1c2f94620ff..846fb769f20 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -12,6 +12,10 @@
"Saving..." => "Sauvegarde...",
"__language_name__" => "Français",
"Security Warning" => "Alertes de sécurité",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exécuter une tâche pour chaque page chargée",
+"cron.php is registered at a webcron service" => "cron.php est enregistré comme un service webcron",
+"use systems cron service" => "utiliser le service cron du système ",
"Log" => "Journaux",
"More" => "Plus",
"Add your App" => "Ajoutez votre application",
@@ -47,7 +51,6 @@
"Create" => "Créer",
"Default Quota" => "Quota par défaut",
"Other" => "Autre",
-"SubAdmin" => "SubAdmin",
"Quota" => "Quota",
"Delete" => "Supprimer"
);
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 5ab1f91e6d3..67937e49214 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,13 +1,21 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Non se puido cargar a lista desde a App Store",
"Email saved" => "Correo electrónico gardado",
"Invalid email" => "correo electrónico non válido",
"OpenID Changed" => "Mudou o OpenID",
"Invalid request" => "Petición incorrecta",
+"Authentication error" => "Erro na autenticación",
"Language changed" => "O idioma mudou",
+"Error" => "Erro",
"Disable" => "Deshabilitar",
"Enable" => "Habilitar",
"Saving..." => "Gardando...",
"__language_name__" => "Galego",
+"Security Warning" => "Aviso de seguridade",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executar unha tarefa con cada páxina cargada",
+"cron.php is registered at a webcron service" => "cron.php está rexistrada como un servizo webcron",
+"use systems cron service" => "utilice o servizo cron do sistema",
"Log" => "Conectar",
"More" => "Máis",
"Add your App" => "Engade o teu aplicativo",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 48a6e14ebb7..4981f446548 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -47,7 +47,6 @@
"Create" => "Létrehozás",
"Default Quota" => "Alapértelmezett kvóta",
"Other" => "Egyéb",
-"SubAdmin" => "al-Admin",
"Quota" => "Kvóta",
"Delete" => "Törlés"
);
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 388f3f5c77a..e02e107ab4f 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -13,6 +13,9 @@
"__language_name__" => "Italiano",
"Security Warning" => "Avviso di sicurezza",
"Cron" => "Cron",
+"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
+"cron.php is registered at a webcron service" => "cron.php è registrato a un servizio webcron",
+"use systems cron service" => "usa il servizio cron di sistema",
"Log" => "Registro",
"More" => "Altro",
"Add your App" => "Aggiungi la tua applicazione",
@@ -48,7 +51,7 @@
"Create" => "Crea",
"Default Quota" => "Quota predefinita",
"Other" => "Altro",
-"SubAdmin" => "SubAdmin",
+"Group Admin" => "Gruppo di amministrazione",
"Quota" => "Quote",
"Delete" => "Elimina"
);
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index ae1ebaf9912..17efda2d22f 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -12,6 +12,10 @@
"Saving..." => "保存中...",
"__language_name__" => "Japanese (日本語)",
"Security Warning" => "セキュリティ警告",
+"Cron" => "cron(自動定期実行)",
+"execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
+"cron.php is registered at a webcron service" => "cron.phpをwebcronサービスに登録しました",
+"use systems cron service" => "システムのcronサービスを使用",
"Log" => "ログ",
"More" => "もっと",
"Add your App" => "アプリを追加",
@@ -47,7 +51,6 @@
"Create" => "作成",
"Default Quota" => "デフォルトのクォータサイズ",
"Other" => "その他",
-"SubAdmin" => "サブ管理者",
"Quota" => "クオータ",
"Delete" => "削除"
);
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 969468117e2..de2384a4ae2 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -45,7 +45,6 @@
"Create" => "Buat",
"Default Quota" => "Kuota Lalai",
"Other" => "Lain",
-"SubAdmin" => "SubAdmin",
"Quota" => "Kuota",
"Delete" => "Padam"
);
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index c000bc4150f..eef450fa686 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,15 +1,18 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
"Email saved" => "Email zapisany",
"Invalid email" => "Niepoprawny email",
"OpenID Changed" => "Zmieniono OpenID",
"Invalid request" => "Nieprawidłowe żądanie",
"Authentication error" => "Błąd uwierzytelniania",
"Language changed" => "Język zmieniony",
+"Error" => "Błąd",
"Disable" => "Wyłączone",
"Enable" => "Włączone",
"Saving..." => "Zapisywanie...",
"__language_name__" => "Polski",
"Security Warning" => "Ostrzeżenia bezpieczeństwa",
+"Cron" => "Cron",
"Log" => "Log",
"More" => "Więcej",
"Add your App" => "Dodaj aplikacje",
@@ -45,7 +48,6 @@
"Create" => "Utwórz",
"Default Quota" => "Domyślny udział",
"Other" => "Inne",
-"SubAdmin" => "SubAdmin",
"Quota" => "Udział",
"Delete" => "Usuń"
);
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index ac169fa3987..949e9572c1c 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,15 +1,21 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Загрузка из App Store запрещена",
"Email saved" => "Email сохранен",
"Invalid email" => "Неправильный Email",
"OpenID Changed" => "OpenID изменён",
"Invalid request" => "Неверный запрос",
"Authentication error" => "Ошибка авторизации",
"Language changed" => "Язык изменён",
+"Error" => "Ошибка",
"Disable" => "Отключить",
"Enable" => "Включить",
"Saving..." => "Сохранение...",
"__language_name__" => "Русский ",
"Security Warning" => "Предупреждение безопасности",
+"Cron" => "Задание",
+"execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
+"cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе",
+"use systems cron service" => "использовать системные задания",
"Log" => "Журнал",
"More" => "Ещё",
"Add your App" => "Добавить приложение",
@@ -45,6 +51,7 @@
"Create" => "Создать",
"Default Quota" => "Квота по умолчанию",
"Other" => "Другое",
+"Group Admin" => "Группа Администраторы",
"Quota" => "Квота",
"Delete" => "Удалить"
);
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 99c6d9d484a..a2404d212b2 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,15 +1,21 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
"Email saved" => "E-poštni naslov je bil shranjen",
"Invalid email" => "Neveljaven e-poštni naslov",
"OpenID Changed" => "OpenID je bil spremenjen",
"Invalid request" => "Neveljaven zahtevek",
"Authentication error" => "Napaka overitve",
"Language changed" => "Jezik je bil spremenjen",
+"Error" => "Napaka",
"Disable" => "Onemogoči",
"Enable" => "Omogoči",
"Saving..." => "Shranjevanje...",
"__language_name__" => "__ime_jezika__",
"Security Warning" => "Varnostno opozorilo",
+"Cron" => "Periodično opravilo",
+"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
+"cron.php is registered at a webcron service" => "cron.php je vpisan na storitev webcron",
+"use systems cron service" => "uporabi sistemski servis za periodična opravila",
"Log" => "Dnevnik",
"More" => "Več",
"Add your App" => "Dodajte vašo aplikacijo",
@@ -45,7 +51,7 @@
"Create" => "Ustvari",
"Default Quota" => "Privzeta količinska omejitev",
"Other" => "Drugo",
-"SubAdmin" => "PodSkrbnik",
+"Group Admin" => "Administrator skupine",
"Quota" => "Količinska omejitev",
"Delete" => "Izbriši"
);
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 0b4462876e1..886148d8ef2 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -12,6 +12,10 @@
"Saving..." => "Sparar...",
"__language_name__" => "__language_name__",
"Security Warning" => "Säkerhetsvarning",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utför en uppgift vid varje sidladdning",
+"cron.php is registered at a webcron service" => "cron.php är registrerad på en webcron-tjänst",
+"use systems cron service" => "använd systemets cron-tjänst",
"Log" => "Logg",
"More" => "Mera",
"Add your App" => "Lägg till din applikation",
@@ -47,7 +51,7 @@
"Create" => "Skapa",
"Default Quota" => "Förvald datakvot",
"Other" => "Annat",
-"SubAdmin" => "Underadministratör",
+"Group Admin" => "Gruppadministratör",
"Quota" => "Kvot",
"Delete" => "Ta bort"
);
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 2d6798ff29e..a062c374c6a 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,13 +1,21 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
"Email saved" => "อีเมลถูกบันทึกแล้ว",
"Invalid email" => "อีเมลไม่ถูกต้อง",
"OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
"Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
"Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Error" => "ข้อผิดพลาด",
"Disable" => "ปิดใช้งาน",
"Enable" => "เปิดใช้งาน",
"Saving..." => "กำลังบันทึุกข้อมูล...",
"__language_name__" => "ภาษาไทย",
+"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
+"cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
+"use systems cron service" => "ใช้บริการ cron จากระบบ",
"Log" => "บันทึกการเปลี่ยนแปลง",
"More" => "เพิ่มเติม",
"Add your App" => "เพิ่มแอปของคุณ",
@@ -43,6 +51,7 @@
"Create" => "สร้าง",
"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
"Other" => "อื่นๆ",
+"Group Admin" => "ผู้ดูแลกลุ่ม",
"Quota" => "พื้นที่",
"Delete" => "ลบ"
);
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e3ba426f5f1..8182236a2d8 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -45,7 +45,6 @@
"Create" => "Oluştur",
"Default Quota" => "Varsayılan Kota",
"Other" => "Diğer",
-"SubAdmin" => "Alt Yönetici",
"Quota" => "Kota",
"Delete" => "Sil"
);
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index cb662c1b646..faf125225ba 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -48,7 +48,6 @@
"Create" => "新建",
"Default Quota" => "默认限额",
"Other" => "其他的",
-"SubAdmin" => "子专辑",
"Quota" => "限额",
"Delete" => "删除"
);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 2e043f0266b..410772e080c 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,13 +1,20 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "无法从应用商店载入列表",
"Email saved" => "电子邮件已保存",
"Invalid email" => "无效的电子邮件",
"OpenID Changed" => "OpenID 已修改",
"Invalid request" => "非法请求",
+"Authentication error" => "认证错误",
"Language changed" => "语言已修改",
+"Error" => "错误",
"Disable" => "禁用",
"Enable" => "启用",
"Saving..." => "正在保存",
"__language_name__" => "简体中文",
+"Security Warning" => "安全警告",
+"Cron" => "计划任务",
+"execute one task with each page loaded" => "为每个装入的页面执行任务",
+"use systems cron service" => "实现系统 cron 服务",
"Log" => "日志",
"More" => "更多",
"Add your App" => "添加应用",
@@ -43,6 +50,7 @@
"Create" => "创建",
"Default Quota" => "默认配额",
"Other" => "其它",
+"Group Admin" => "组管理",
"Quota" => "配额",
"Delete" => "删除"
);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 3e9faddadf2..5298237f679 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -77,7 +77,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
- <th id="headerSubAdmins"><?php echo $l->t('SubAdmin'); ?></th>
+ <th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
<?php endif;?>
<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
<th id="headerRemove">&nbsp;</th>
@@ -109,7 +109,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
class="subadminsselect"
data-username="<?php echo $user['name'] ;?>"
data-subadmin="<?php echo $user['subadmin'] ;?>"
- data-placeholder="subadmins" title="<?php echo $l->t('SubAdmin')?>"
+ data-placeholder="subadmins" title="<?php echo $l->t('Group Admin')?>"
multiple="multiple">
<?php foreach($_["subadmingroups"] as $group): ?>
<option value="<?php echo $group;?>">
diff --git a/settings/trans.png b/settings/trans.png
index e6920168bf2..ef57510d530 100644
--- a/settings/trans.png
+++ b/settings/trans.png
Binary files differ
diff --git a/tests/data/logo-wide.png b/tests/data/logo-wide.png
index b2c16a0f60a..648cb7e6156 100644
--- a/tests/data/logo-wide.png
+++ b/tests/data/logo-wide.png
Binary files differ
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
index 1779127c932..1711be58e01 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -130,4 +130,12 @@ abstract class Test_Archive extends UnitTestCase {
$this->instance->remove('target.txt');
$this->assertFalse($this->instance->fileExists('target.txt'));
}
+ public function testRecursive(){
+ $dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+ $this->instance=$this->getNew();
+ $this->instance->addRecursive('/dir',$dir);
+ $this->assertTrue($this->instance->fileExists('/dir/lorem.txt'));
+ $this->assertTrue($this->instance->fileExists('/dir/data.zip'));
+ $this->assertTrue($this->instance->fileExists('/dir/data.tar.gz'));
+ }
}
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 4120df18de6..0a8715600d5 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -129,12 +129,25 @@ abstract class Test_FileStorage extends UnitTestCase {
$this->assertEqual(file_get_contents($textFile),$this->instance->file_get_contents('/target.txt'));
}
- public function testLocalFile(){
+ public function testLocal(){
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
$localFile=$this->instance->getLocalFile('/lorem.txt');
$this->assertTrue(file_exists($localFile));
$this->assertEqual(file_get_contents($localFile),file_get_contents($textFile));
+
+ $this->instance->mkdir('/folder');
+ $this->instance->file_put_contents('/folder/lorem.txt',file_get_contents($textFile));
+ $this->instance->file_put_contents('/folder/bar.txt','asd');
+ $this->instance->mkdir('/folder/recursive');
+ $this->instance->file_put_contents('/folder/recursive/file.txt','foo');
+ $localFolder=$this->instance->getLocalFolder('/folder');
+
+ $this->assertTrue(is_dir($localFolder));
+ $this->assertTrue(file_exists($localFolder.'/lorem.txt'));
+ $this->assertEqual(file_get_contents($localFolder.'/lorem.txt'),file_get_contents($textFile));
+ $this->assertEqual(file_get_contents($localFolder.'/bar.txt'),'asd');
+ $this->assertEqual(file_get_contents($localFolder.'/recursive/file.txt'),'foo');
}
public function testStat(){
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index e041255ec91..72af0835788 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -62,6 +62,7 @@ class Test_Filesystem extends UnitTestCase{
public function testNormalize(){
$this->assertEqual('/path',OC_Filesystem::normalizePath('/path/'));
+ $this->assertEqual('/path/',OC_Filesystem::normalizePath('/path/',false));
$this->assertEqual('/path',OC_Filesystem::normalizePath('path'));
$this->assertEqual('/path',OC_Filesystem::normalizePath('\path'));
$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo//bar/'));