Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support

Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php

1 files changed, 126 insertions, 53 deletions

diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index bfba23fabcf..e404b7a5e94 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,39 +1,42 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
-"There was an error adding the contact." => "Med dodajanjem stika je prišlo do napake",
-"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 informacije o stiku.",
+"id is not set." => "id ni nastavljen.",
+"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
+"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
 "No ID provided" => "ID ni bil podan",
 "Error setting checksum." => "Napaka pri nastavljanju nadzorne vsote.",
 "No categories selected for deletion." => "Nobena kategorija ni bila izbrana za izbris.",
 "No address books found." => "Ni bilo najdenih imenikov.",
 "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:",
+"Missing IM parameter." => "Manjkajoč IM parameter.",
+"Unknown IM: " => "Neznan IM:",
+"Information about vCard is incorrect. Please reload the page." => "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.",
 "Missing ID" => "Manjkajoč ID",
 "Error parsing VCard for ID: \"" => "Napaka pri razčlenjevanju VCard za ID: \"",
-"Cannot add addressbook with an empty name." => "Ne morem dodati imenika s praznim imenom.",
-"Error adding addressbook." => "Napaka pri dodajanju imenika.",
-"Error activating addressbook." => "Napaka pri aktiviranju imenika.",
+"checksum is not set." => "nadzorna vsota ni nastavljena.",
+"Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
+"Something went FUBAR. " => "Nekaj je šlo v franže. ",
 "No contact ID was submitted." => "ID stika ni bil poslan.",
 "Error reading contact photo." => "Napaka pri branju slike stika.",
 "Error saving temporary file." => "Napaka pri shranjevanju začasne datoteke.",
 "The loading photo is not valid." => "Slika, ki se nalaga ni veljavna.",
-"id is not set." => "id ni nastavljen.",
-"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.",
 "Contact ID is missing." => "Manjka ID stika.",
-"Missing contact id." => "Manjka id stika.",
 "No photo path was submitted." => "Pot slike ni bila poslana.",
 "File doesn't exist:" => "Datoteka ne obstaja:",
 "Error loading image." => "Napaka pri nalaganju slike.",
-"element name is not set." => "ime elementa ni nastavljeno.",
-"checksum is not set." => "nadzorna vsota ni nastavljena.",
-"Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
-"Something went FUBAR. " => "Nekaj je šlo v franže. ",
-"Error updating contact property." => "Napaka pri posodabljanju lastnosti stika.",
-"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
-"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
+"Error getting contact object." => "Napaka pri pridobivanju kontakta predmeta.",
+"Error getting PHOTO property." => "Napaka pri pridobivanju lastnosti fotografije.",
+"Error saving contact." => "Napaka pri shranjevanju stika.",
+"Error resizing image" => "Napaka pri spreminjanju velikosti slike",
+"Error cropping image" => "Napaka pri obrezovanju slike",
+"Error creating temporary image" => "Napaka pri ustvarjanju začasne slike",
+"Error finding image: " => "Napaka pri iskanju datoteke: ",
 "Error uploading contacts to storage." => "Napaka pri nalaganju stikov v hrambo.",
 "There is no error, the file uploaded with success" => "Datoteka je bila uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini",
@@ -41,17 +44,46 @@
 "The uploaded file was only partially uploaded" => "Datoteka je bila le delno naložena",
 "No file was uploaded" => "Nobena datoteka ni bila naložena",
 "Missing a temporary folder" => "Manjka začasna mapa",
+"Couldn't save temporary image: " => "Začasne slike ni bilo mogoče shraniti: ",
+"Couldn't load temporary image: " => "Začasne slike ni bilo mogoče naložiti: ",
+"No file was uploaded. Unknown error" => "Nobena datoteka ni bila naložena. Neznana napaka",
 "Contacts" => "Stiki",
-"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
-"Addressbook not found." => "Imenik ni bil najden.",
+"Sorry, this functionality has not been implemented yet" => "Žal ta funkcionalnost še ni podprta",
+"Not implemented" => "Ni podprto",
+"Couldn't get a valid address." => "Ne morem dobiti veljavnega naslova.",
+"Error" => "Napaka",
+"This property has to be non-empty." => "Ta lastnost ne sme biti prazna",
+"Couldn't serialize elements." => "Predmetov ni bilo mogoče dati v zaporedje.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org",
+"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",
-"Telephone" => "Telefon",
-"Email" => "E-pošta",
-"Organization" => "Organizacija",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Delo",
 "Home" => "Doma",
+"Other" => "Drugo",
 "Mobile" => "Mobilni telefon",
 "Text" => "Besedilo",
 "Voice" => "Glas",
@@ -60,25 +92,52 @@
 "Video" => "Video",
 "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",
+"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",
-"Configure Address Books" => "Nastavi imenike",
-"New Address Book" => "Nov imenik",
-"Import from VCF" => "Uvozi iz VCF",
-"CardDav Link" => "CardDav povezava",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"Delete" => "Izbriši",
-"Download contact" => "Prenesi stik",
-"Delete contact" => "Izbriši stik",
+"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",
+"Upload new photo" => "Naloži novo sliko",
+"Select photo from ownCloud" => "Izberi sliko iz ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico",
 "Edit name details" => "Uredite podrobnosti imena",
+"Organization" => "Organizacija",
+"Delete" => "Izbriši",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
-"Birthday" => "Rojstni dan",
+"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",
@@ -90,28 +149,33 @@
 "Delete email address" => "Izbriši e-poštni naslov",
 "Enter phone number" => "Vpiši telefonsko številko",
 "Delete phone number" => "Izbriši telefonsko številko",
+"Instant Messenger" => "Takojšni sporočilnik",
+"Delete IM" => "Izbriši IM",
 "View on map" => "Prikaz na zemljevidu",
 "Edit address details" => "Uredi podrobnosti",
 "Add notes here." => "Opombe dodajte tukaj.",
 "Add field" => "Dodaj polje",
-"Profile picture" => "Slika profila",
 "Phone" => "Telefon",
+"Email" => "E-pošta",
+"Instant Messaging" => "Neposredno sporočanje",
+"Address" => "Naslov",
 "Note" => "Opomba",
-"Delete current photo" => "Izbriši trenutno sliko",
-"Edit current photo" => "Uredi trenutno sliko",
-"Upload new photo" => "Naloži novo sliko",
-"Select photo from ownCloud" => "Izberi sliko iz ownCloud",
+"Download contact" => "Prenesi stik",
+"Delete contact" => "Izbriši stik",
+"The temporary image has been removed from cache." => "Začasna slika je bila odstranjena iz predpomnilnika.",
 "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",
-"Street" => "Ulica",
+"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",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Addressbook" => "Imenik",
 "Hon. prefixes" => "Predpone",
 "Miss" => "gdč.",
@@ -132,26 +196,35 @@
 "Esq." => "Esq.",
 "Jr." => "mlajši",
 "Sn." => "starejši",
-"New Addressbook" => "Nov imenik",
-"Edit Addressbook" => "Uredi imenik",
-"Displayname" => "Ime za prikaz",
-"Active" => "Aktiven",
-"Save" => "Shrani",
-"Submit" => "Potrdi",
-"Cancel" => "Prekliči",
 "Import a contacts file" => "Uvozi datoteko s stiki",
 "Please choose the addressbook" => "Prosimo, če izberete imenik",
 "create a new addressbook" => "Ustvari nov imenik",
 "Name of new addressbook" => "Ime novega imenika",
-"Import" => "Uvozi",
 "Importing contacts" => "Uvažam stike",
+"Contacts imported successfully" => "Stiki so bili uspešno uvoženi",
+"Close Dialog" => "Zapri dialog",
+"Import Addressbook" => "Uvozi imenik",
 "Select address book to import to:" => "Izberite imenik v katerega boste uvažali:",
+"Drop a VCF file to import contacts." => "Za uvoz stikov spustite VCF datoteko tukaj.",
 "Select from HD" => "Izberi iz HD",
 "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"
+"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",
+"Share" => "Souporaba",
+"Download" => "Prenesi",
+"Edit" => "Uredi",
+"New Address Book" => "Nov imenik",
+"Name" => "Ime",
+"Description" => "Opis",
+"Save" => "Shrani",
+"Cancel" => "Prekliči",
+"More..." => "Več..."
 );