diff --git a/apps/bookmarks/l10n/bg_BG.php b/apps/bookmarks/l10n/bg_BG.php
new file mode 100644
index 0000000000000000000000000000000000000000..04d731b1074d729ce5a16993afe39bc36a2d6ebf
--- /dev/null
+++ b/apps/bookmarks/l10n/bg_BG.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 />" => "Бутон за отметки <br />"
+);
diff --git a/apps/bookmarks/l10n/et_EE.php b/apps/bookmarks/l10n/et_EE.php
new file mode 100644
index 0000000000000000000000000000000000000000..da9e4d92a6f63ad2acb3149714555a45e56b86de
--- /dev/null
+++ b/apps/bookmarks/l10n/et_EE.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Järjehoidjad",
+"unnamed" => "nimetu",
+"Read later" => "Loe hiljem",
+"Address" => "Aadress",
+"Title" => "Pealkiri",
+"Tags" => "Sildid",
+"Save bookmark" => "Salvesta järjehoidja",
+"You have no bookmarks" => "Sul pole järjehoidjaid"
+);
diff --git a/apps/bookmarks/l10n/fr.php b/apps/bookmarks/l10n/fr.php
new file mode 100644
index 0000000000000000000000000000000000000000..508c82369fbcf910181366b5e130b29ba0a3e2d8
--- /dev/null
+++ b/apps/bookmarks/l10n/fr.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Favoris",
+"unnamed" => "sans titre",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :",
+"Read later" => "Lire plus tard",
+"Address" => "Adresse",
+"Title" => "Titre",
+"Tags" => "Étiquettes",
+"Save bookmark" => "Sauvegarder le favori",
+"You have no bookmarks" => "Vous n'avez aucun favori",
+"Bookmarklet <br />" => "Gestionnaire de favoris <br />"
+);
diff --git a/apps/bookmarks/l10n/it.php b/apps/bookmarks/l10n/it.php
new file mode 100644
index 0000000000000000000000000000000000000000..862d75bde45a4f915803bc7e7e952d5993089856
--- /dev/null
+++ b/apps/bookmarks/l10n/it.php
@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Segnalibri",
+"unnamed" => "senza nome",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:",
+"Read later" => "Leggi dopo",
+"Address" => "Indirizzo",
+"Title" => "Titolo",
+"Tags" => "Tag",
+"Save bookmark" => "Salva segnalibro",
+"You have no bookmarks" => "Non hai segnalibri",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
index e4f73d24a9acf9db42315f89a8fa3d4e0ca65a77..592502b2687cf0f13f4d98fa69abfd9ca170e690 100644
--- a/apps/calendar/l10n/bg_BG.php
+++ b/apps/calendar/l10n/bg_BG.php
@@ -1,7 +1,23 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Не са открити календари.",
+"No events found." => "Не са открити събития.",
+"Import failed" => "Грешка при внасяне",
+"New Timezone:" => "Нов часови пояс:",
 "Timezone changed" => "Часовата зона е сменена",
 "Invalid request" => "Невалидна заявка",
 "Calendar" => "Календар",
+"Birthday" => "Роджен ден",
+"Clients" => "Клиенти",
+"Holidays" => "Празници",
+"Ideas" => "Идеи",
+"Journey" => "Пътуване",
+"Meeting" => "Среща",
+"Other" => "Друго",
+"Personal" => "Лично",
+"Projects" => "Проекти",
+"Questions" => "Въпроси",
+"Work" => "Работа",
+"New Calendar" => "Нов календар",
 "Does not repeat" => "Не се повтаря",
 "Daily" => "Дневно",
 "Weekly" => "Седмично",
@@ -9,32 +25,64 @@
 "Bi-Weekly" => "Двуседмично",
 "Monthly" => "Месечно",
 "Yearly" => "Годишно",
+"never" => "никога",
+"Monday" => "Понеделник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Сряда",
+"Thursday" => "Четвъртък",
+"Friday" => "Петък",
+"Saturday" => "Събота",
+"Sunday" => "Неделя",
 "All day" => "Всички дни",
+"Missing fields" => "Липсват полета",
 "Title" => "Заглавие",
 "Week" => "Седмица",
 "Month" => "Месец",
+"List" => "Списък",
 "Today" => "Днес",
 "Calendars" => "Календари",
 "There was a fail, while parsing the file." => "Възникна проблем с разлистването на файла.",
 "Choose active calendars" => "Изберете активен календар",
+"Your calendars" => "Вашите календари",
+"Shared calendars" => "Споделени календари",
+"No shared calendars" => "Няма споделени календари",
+"Share Calendar" => "Споделяне на календар",
 "Download" => "Изтегляне",
 "Edit" => "Промяна",
+"Delete" => "Изтриване",
+"New calendar" => "Нов календар",
 "Edit calendar" => "Промени календар",
 "Displayname" => "Екранно име",
 "Active" => "Активен",
 "Calendar color" => "Цвят на календара",
+"Save" => "Запис",
 "Submit" => "Продължи",
+"Cancel" => "Отказ",
 "Edit an event" => "Промяна на събитие",
+"Export" => "Изнасяне",
+"Share" => "Споделяне",
 "Title of the Event" => "Наименование",
 "Category" => "Категория",
+"Separate categories with commas" => "Отделете категориите със запетаи",
+"Edit categories" => "Редактиране на категориите",
 "All Day Event" => "Целодневно събитие",
 "From" => "От",
 "To" => "До",
+"Advanced options" => "Разширени настройки",
 "Location" => "Локация",
 "Location of the Event" => "Локация",
 "Description" => "Описание",
 "Description of the Event" => "Описание",
 "Repeat" => "Повтори",
+"create a new calendar" => "създаване на нов календар",
+"Please choose a calendar" => "Изберете календар",
+"Name of new calendar" => "Име на новия календар",
+"Import" => "Внасяне",
+"Close Dialog" => "Затваряне на прозореца",
 "Create a new event" => "Ново събитие",
-"Timezone" => "Часова зона"
+"View an event" => "Преглед на събитие",
+"No categories selected" => "Няма избрани категории",
+"Timezone" => "Часова зона",
+"First day of the week" => "Първи ден на седмицата",
+"Groups" => "Групи"
 );
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 289bc905b3cf60932c9e89d3bf6a828fbeaa6898..c43b16631e4f19d119e002d889c906427693a3b9 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -12,12 +12,12 @@
 "Timezone changed" => "Fuseau horaire modifié",
 "Invalid request" => "Requête invalide",
 "Calendar" => "Calendrier",
-"ddd" => "jjj",
-"ddd M/d" => "jjj M/j",
-"dddd M/d" => "jjjj M/j",
-"MMMM yyyy" => "MMMM aaaa",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "jjjj, MMM j, aaaa",
+"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
 "Birthday" => "Anniversaire",
 "Business" => "Professionnel",
 "Call" => "Appel",
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index b91e8b0df0b31e541012c3f6def2decbc4a4f30e..68f3e89dae137f2e8b15db24e2b961fd3edacad7 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -12,12 +12,12 @@
 "Timezone changed" => "Fuso orario cambiato",
 "Invalid request" => "Richiesta non valida",
 "Calendar" => "Calendario",
-"ddd" => "ggg",
-"ddd M/d" => "ggg M/g",
-"dddd M/d" => "gggg M/g",
-"MMMM yyyy" => "MMMM aaaa",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"dddd, MMM d, yyyy" => "gggg, MMM g, aaaa",
+"dddd, MMM d, yyyy" => "dddd, d MMM yyyy",
 "Birthday" => "Compleanno",
 "Business" => "Azienda",
 "Call" => "Chiama",
@@ -141,7 +141,7 @@
 "Share" => "Condividi",
 "Title of the Event" => "Titolo dell'evento",
 "Category" => "Categoria",
-"Separate categories with commas" => "Categorie separate con virgole",
+"Separate categories with commas" => "Categorie separate da virgole",
 "Edit categories" => "Modifica le categorie",
 "All Day Event" => "Evento che occupa tutta la giornata",
 "From" => "Da",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index af40b06b9ff169bf8f437c66085286844a4363a8..934e2c4840a0e91587bf8ac9b20244179489a239 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -1,11 +1,23 @@
 <?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" => "Неверный запрос",
 "Calendar" => "Календарь",
+"ddd" => "ддд",
+"ddd M/d" => "ддд М/д",
+"dddd M/d" => "дддд М/д",
+"MMMM yyyy" => "ММММ гггг",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
 "Birthday" => "День рождения",
 "Business" => "Бизнес",
 "Call" => "Звонить",
@@ -22,6 +34,7 @@
 "Questions" => "Вопросы",
 "Work" => "Работа",
 "unnamed" => "без имени",
+"New Calendar" => "Новый Календарь",
 "Does not repeat" => "Не повторяется",
 "Daily" => "Ежедневно",
 "Weekly" => "Еженедельно",
@@ -66,8 +79,26 @@
 "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" => "Весь день",
-"New Calendar" => "Новый Календарь",
 "Missing fields" => "Незаполненные поля",
 "Title" => "Название",
 "From Date" => "Дата начала",
@@ -131,25 +162,24 @@
 "Interval" => "Интервал",
 "End" => "Окончание",
 "occurrences" => "повторений",
-"Import a calendar file" => "Импортировать календарь из файла",
-"Please choose the calendar" => "Пожалуйста, выберите календарь",
 "create a new calendar" => "Создать новый календарь",
+"Import a calendar file" => "Импортировать календарь из файла",
+"Please choose a calendar" => "Пожалуйста, выберите календарь",
 "Name of new calendar" => "Название нового календаря",
 "Import" => "Импортировать",
-"Importing calendar" => "Импортируется календарь",
-"Calendar imported successfully" => "Календарь успешно импортирован",
 "Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое событие",
 "View an event" => "Показать событие",
 "No categories selected" => "Категории не выбраны",
-"Select category" => "Выбрать категорию",
+"of" => "из",
+"at" => "на",
 "Timezone" => "Часовой пояс",
 "Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
 "Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
 "First day of the week" => "Первый день недели",
-"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:",
+"more info" => "подробнее",
 "Users" => "Пользователи",
 "select users" => "выбрать пользователей",
 "Editable" => "Редактируемо",
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
index a72e4c39f6d114670d576b6fb5b1fdaa0dd977fc..912228dc72a12259de9bf5db11a5c44f1e7357b9 100644
--- a/apps/calendar/l10n/tr.php
+++ b/apps/calendar/l10n/tr.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Bütün takvimler tamamen  ön belleğe alınmadı",
+"Everything seems to be completely cached" => "Bütün herşey tamamen ön belleğe alınmış görünüyor",
 "No calendars found." => "Takvim yok.",
 "No events found." => "Etkinlik yok.",
 "Wrong calendar" => "Yanlış takvim",
+"The file contained either no events or all events are already saved in your calendar." => "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı.",
+"events has been saved in the new calendar" => "Etkinlikler yeni takvimde saklandı",
+"Import failed" => "İçeri aktarma başarısız oldu.",
+"events has been saved in your calendar" => "Etkinlikler takviminizde saklandı",
 "New Timezone:" => "Yeni Zamandilimi:",
 "Timezone changed" => "Zaman dilimi değiştirildi",
 "Invalid request" => "Geçersiz istek",
 "Calendar" => "Takvim",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Doğum günü",
 "Business" => "İş",
 "Call" => "Arama",
@@ -22,7 +33,9 @@
 "Projects" => "Projeler",
 "Questions" => "Sorular",
 "Work" => "İş",
+"by" => "hazırlayan",
 "unnamed" => "isimsiz",
+"New Calendar" => "Yeni Takvim",
 "Does not repeat" => "Tekrar etmiyor",
 "Daily" => "Günlük",
 "Weekly" => "Haftalı",
@@ -67,8 +80,26 @@
 "by day and month" => "gün ve aya göre",
 "Date" => "Tarih",
 "Cal." => "Takv.",
+"Sun." => "Paz.",
+"Mon." => "Pzt.",
+"Tue." => "Sal.",
+"Wed." => "Çar.",
+"Thu." => "Per.",
+"Fri." => "Cum.",
+"Sat." => "Cmt.",
+"Jan." => "Oca.",
+"Feb." => "Şbt.",
+"Mar." => "Mar.",
+"Apr." => "Nis",
+"May." => "May.",
+"Jun." => "Haz.",
+"Jul." => "Tem.",
+"Aug." => "Agu.",
+"Sep." => "Eyl.",
+"Oct." => "Eki.",
+"Nov." => "Kas.",
+"Dec." => "Ara.",
 "All day" => "Tüm gün",
-"New Calendar" => "Yeni Takvim",
 "Missing fields" => "Eksik alanlar",
 "Title" => "Başlık",
 "From Date" => "Bu Tarihten",
@@ -132,18 +163,17 @@
 "Interval" => "Aralık",
 "End" => "Son",
 "occurrences" => "olaylar",
-"Import a calendar file" => "Takvim dosyasını içeri aktar",
-"Please choose the calendar" => "Lütfen takvimi seçin",
 "create a new calendar" => "Yeni bir takvim oluştur",
+"Import a calendar file" => "Takvim dosyasını içeri aktar",
+"Please choose a calendar" => "Lütfen takvim seçiniz",
 "Name of new calendar" => "Yeni takvimin adı",
+"Take an available name!" => "Müsait ismi al !",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir.",
 "Import" => "İçe Al",
-"Importing calendar" => "Takvim içe aktarılıyor",
-"Calendar imported successfully" => "Takvim başarıyla içe aktarıldı",
 "Close Dialog" => "Diyalogu kapat",
 "Create a new event" => "Yeni olay oluştur",
 "View an event" => "Bir olay görüntüle",
 "No categories selected" => "Kategori seçilmedi",
-"Select category" => "Kategori seçin",
 "of" => "nın",
 "at" => "üzerinde",
 "Timezone" => "Zaman dilimi",
@@ -152,7 +182,13 @@
 "24h" => "24s",
 "12h" => "12s",
 "First day of the week" => "Haftanın ilk günü",
-"Calendar CalDAV syncing address:" => "CalDAV Takvim eşzamanlama adresi:",
+"Cache" => "Önbellek",
+"Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.",
+"Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.",
+"more info" => "daha fazla bilgi",
+"Primary address (Kontact et al)" => "Öncelikli adres",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Sadece okunabilir iCalendar link(ler)i",
 "Users" => "Kullanıcılar",
 "select users" => "kullanıcıları seç",
 "Editable" => "Düzenlenebilir",
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 6bebda3b6ad5d81279e8c92914bb26e9c231ce19..2b3a0c97bea99d898198a6d9c7b50f3b324a9db9 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -3,14 +3,12 @@
 "There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
-"Error adding contact property." => "خطء خلال اضافة صفة المعرفه.",
-"Error adding addressbook." => "خطء خلال اضافة كتاب عناوين.",
-"Error activating addressbook." => "خطء خلال تفعيل كتاب العناوين.",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
 "Error deleting contact property." => "خطء خلال محي الصفه.",
 "Error updating contact property." => "خطء خلال تعديل الصفه.",
 "Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "Contacts" => "المعارف",
+"Contact" => "معرفه",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
 "Address" => "عنوان",
@@ -25,7 +23,7 @@
 "Fax" => "الفاكس",
 "Video" => "الفيديو",
 "Pager" => "الرنان",
-"Contact" => "معرفه",
+"Birthday" => "تاريخ الميلاد",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
 "New Address Book" => "كتاب عناوين جديد",
@@ -33,20 +31,17 @@
 "Download" => "انزال",
 "Edit" => "تعديل",
 "Delete" => "حذف",
-"Download contact" => "انزال المعرفه",
-"Delete contact" => "امحي المعرفه",
-"Birthday" => "تاريخ الميلاد",
 "Preferred" => "مفضل",
 "Phone" => "الهاتف",
+"Download contact" => "انزال المعرفه",
+"Delete contact" => "امحي المعرفه",
 "Type" => "نوع",
 "PO Box" => "العنوان البريدي",
 "Extended" => "إضافة",
-"Street" => "شارع",
 "City" => "المدينة",
 "Region" => "المنطقة",
 "Zipcode" => "رقم المنطقة",
 "Country" => "البلد",
-"Add" => "أدخل",
 "Addressbook" => "كتاب العناوين",
 "New Addressbook" => "كتاب عناوين جديد",
 "Edit Addressbook" => "عدل كتاب العناوين",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 391a62010b1b0b8b2b1880702de65478c46ea689..834fa472405996115c969912561fef718e9b1a00 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
 "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.",
+"id is not set." => "id neni nastaveno.",
 "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řdávání údaje kontaktu.",
 "No ID provided" => "ID nezadáno",
 "Error setting checksum." => "Chyba při nastavování kontrolního součtu.",
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány k smazání.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Žádné kontakty nenalezeny.",
 "Missing ID" => "Chybí ID",
 "Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
-"Cannot add addressbook with an empty name." => "Nelze přidat adresář s prázdným jménem.",
-"Error adding addressbook." => "Chyba při přidávání adresáře.",
-"Error activating addressbook." => "Chyba při aktivaci adresáře.",
 "No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
 "Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
 "Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
 "The loading photo is not valid." => "Načítaná fotka je vadná.",
-"id is not set." => "id neni nastaveno.",
 "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.",
 "Contact ID is missing." => "Chybí ID kontaktu.",
-"Missing contact id." => "Chybí id kontaktu.",
 "No photo path was submitted." => "Žádná fotka nebyla nahrána.",
 "File doesn't exist:" => "Soubor neexistuje:",
 "Error loading image." => "Chyba při načítání obrázku.",
-"element name is not set." => "jméno elementu není nastaveno.",
+"Error getting contact object." => "Chyba při převzetí objektu kontakt.",
+"Error getting PHOTO property." => "Chyba při získávání fotky.",
+"Error saving contact." => "Chyba při ukládání kontaktu.",
+"Error resizing image" => "Chyba při změně velikosti obrázku.",
+"Error cropping image" => "Chyba při osekávání obrázku.",
+"Error creating temporary image" => "Chyba při vytváření dočasného obrázku.",
+"Error finding image: " => "Chyba při hledání obrázku:",
 "checksum is not set." => "kontrolní součet není nastaven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Něco se pokazilo. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Nahrávaný soubor se nahrál pouze z části",
 "No file was uploaded" => "Žádný soubor nebyl nahrán",
 "Missing a temporary folder" => "Chybí dočasný adresář",
+"Couldn't save temporary image: " => "Nemohu uložit dočasný obrázek: ",
+"Couldn't load temporary image: " => "Nemohu načíst dočasný obrázek: ",
+"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
 "Contacts" => "Kontakty",
-"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
+"Sorry, this functionality has not been implemented yet" => "Bohužel, tato funkce nebyla ještě implementována.",
+"Not implemented" => "Neimplementováno",
+"Couldn't get a valid address." => "Nelze získat platnou adresu.",
+"Error" => "Chyba",
+"Contact" => "Kontakt",
+"This property has to be non-empty." => "Tento parametr nemuže zůstat nevyplněn.",
+"Couldn't serialize elements." => "Prvky nelze převést..",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org",
+"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.",
+"Select type" => "Vybrat typ",
+"Result: " => "Výsledek: ",
+" imported, " => "importováno v pořádku,",
+" failed." => "neimportováno.",
 "Addressbook not found." => "Adresář nenalezen.",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Narozeniny",
 "{name}'s Birthday" => "Narozeniny {name}",
-"Contact" => "Kontakt",
 "Add Contact" => "Přidat kontakt",
+"Import" => "Import",
 "Addressbooks" => "Adresáře",
+"Close" => "Zavřít",
 "Configure Address Books" => "Nastavit adresáře",
 "New Address Book" => "Nový adresář",
-"Import from VCF" => "Importovat z VCF",
 "CardDav Link" => "CardDav odkaz",
 "Download" => "Stažení",
 "Edit" => "Editovat",
 "Delete" => "Odstranit",
-"Download contact" => "Stáhnout kontakt",
-"Delete contact" => "Odstranit 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",
+"Upload new photo" => "Nahrát novou fotku",
+"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami",
 "Edit name details" => "Upravit podrobnosti jména",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
-"Birthday" => "Narozeniny",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupiny",
 "Separate groups with commas" => "Oddělte skupiny čárkami",
@@ -94,24 +115,19 @@
 "Edit address details" => "Upravit podrobnosti adresy",
 "Add notes here." => "Zde můžete připsat poznámky.",
 "Add field" => "Přidat políčko",
-"Profile picture" => "Profilová fotka",
 "Phone" => "Telefon",
 "Note" => "Poznámka",
-"Delete current photo" => "Smazat současnou fotku",
-"Edit current photo" => "Upravit současnou fotku",
-"Upload new photo" => "Nahrát novou fotku",
-"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
+"Download contact" => "Stáhnout kontakt",
+"Delete contact" => "Odstranit kontakt",
+"The temporary image has been removed from cache." => "Obrázek byl odstraněn z dočasné paměti.",
 "Edit address" => "Upravit adresu",
 "Type" => "Typ",
 "PO Box" => "PO box",
 "Extended" => "Rozšířené",
-"Street" => "Ulice",
 "City" => "Město",
 "Region" => "Kraj",
 "Zipcode" => "PSČ",
 "Country" => "Země",
-"Edit categories" => "Upravit kategorie",
-"Add" => "Přidat",
 "Addressbook" => "Adresář",
 "Hon. prefixes" => "Tituly před",
 "Miss" => "Slečna",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Prosím zvolte adresář",
 "create a new addressbook" => "vytvořit nový adresář",
 "Name of new addressbook" => "Jméno nového adresáře",
-"Import" => "Import",
 "Importing contacts" => "Importování kontaktů",
-"Select address book to import to:" => "Vyberte adresář do kterého chcete importovat:",
-"Select from HD" => "Vybrat z disku",
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
 "Configure addressbooks" => "Nastavit adresář",
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index 28753edda4ed7ffc71453e70999843f5eaf18b71..cae783d2972f82193619848e291994228fccd9ea 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,33 +1,35 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
 "There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
+"element name is not set." => "Elementnavnet er ikke medsendt.",
+"id is not set." => "Intet ID medsendt.",
 "Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
 "At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
 "Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
-"Error adding contact property." => "Fejl ved tilføjelse af egenskab.",
 "No ID provided" => "Intet ID medsendt",
 "Error setting checksum." => "Kunne ikke sætte checksum.",
 "No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
 "No address books found." => "Der blev ikke fundet nogen adressebøger.",
 "No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
 "Missing ID" => "Manglende ID",
-"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'en: \"",
-"Cannot add addressbook with an empty name." => "Kan ikke tilføje adressebog uden et navn.",
-"Error adding addressbook." => "Fejl ved tilføjelse af adressebog.",
-"Error activating addressbook." => "Fejl ved aktivering af adressebog.",
+"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'et: \"",
 "No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
 "Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
 "Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
 "The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
-"id is not set." => "Intet ID medsendt.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
 "Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
 "Contact ID is missing." => "Kontaktperson ID mangler.",
-"Missing contact id." => "Kontaktperson ID mangler.",
 "No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
 "Error loading image." => "Kunne ikke indlæse billede.",
-"element name is not set." => "Element navnet er ikke medsendt.",
+"Error getting contact object." => "Fejl ved indlæsning af kontaktpersonobjektet.",
+"Error getting PHOTO property." => "Fejl ved indlæsning af PHOTO feltet.",
+"Error saving contact." => "Kunne ikke gemme kontaktpersonen.",
+"Error resizing image" => "Kunne ikke ændre billedets størrelse",
+"Error cropping image" => "Kunne ikke beskære billedet",
+"Error creating temporary image" => "Kunne ikke oprette midlertidigt billede",
+"Error finding image: " => "Kunne ikke finde billedet: ",
 "checksum is not set." => "Checksum er ikke medsendt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
 "Something went FUBAR. " => "Noget gik grueligt galt. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
 "No file was uploaded" => "Ingen fil uploadet",
 "Missing a temporary folder" => "Manglende midlertidig mappe.",
+"Couldn't save temporary image: " => "Kunne ikke gemme midlertidigt billede: ",
+"Couldn't load temporary image: " => "Kunne ikke indlæse midlertidigt billede",
+"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
 "Contacts" => "Kontaktpersoner",
-"Drop a VCF file to import contacts." => "Drop en VCF fil for at importere kontaktpersoner.",
+"Sorry, this functionality has not been implemented yet" => "Denne funktion er desværre ikke implementeret endnu",
+"Not implemented" => "Ikke implementeret",
+"Couldn't get a valid address." => "Kunne ikke finde en gyldig adresse.",
+"Error" => "Fejl",
+"Contact" => "Kontaktperson",
+"This property has to be non-empty." => "Dette felt må ikke være tomt.",
+"Couldn't serialize elements." => "Kunne ikke serialisere elementerne.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org",
+"Edit name" => "Rediger navn",
+"No files selected for upload." => "Der er ikke valgt nogen filer at uploade.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Dr.",
+"Select type" => "Vælg type",
+"Result: " => "Resultat:",
+" imported, " => " importeret ",
+" failed." => " fejl.",
 "Addressbook not found." => "Adressebogen blev ikke fundet.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Personsøger",
 "Internet" => "Internet",
-"{name}'s Birthday" => "{name}'s fødselsdag",
-"Contact" => "Kontaktperson",
+"Birthday" => "Fødselsdag",
+"{name}'s Birthday" => "{name}s fødselsdag",
 "Add Contact" => "Tilføj kontaktperson",
+"Import" => "Importer",
 "Addressbooks" => "Adressebøger",
+"Close" => "Luk",
 "Configure Address Books" => "Konfigurer adressebøger",
 "New Address Book" => "Ny adressebog",
-"Import from VCF" => "Importer fra VCF",
 "CardDav Link" => "CardDav-link",
 "Download" => "Download",
 "Edit" => "Rediger",
 "Delete" => "Slet",
-"Download contact" => "Download kontaktperson",
-"Delete contact" => "Slet kontaktperson",
 "Drop photo to upload" => "Drop foto for at uploade",
+"Delete current photo" => "Slet nuværende foto",
+"Edit current photo" => "Rediger nuværende foto",
+"Upload new photo" => "Upload nyt foto",
+"Select photo from ownCloud" => "Vælg foto fra ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
 "Edit name details" => "Rediger navnedetaljer.",
-"Nickname" => "Øgenavn",
-"Enter nickname" => "Indtast øgenavn",
-"Birthday" => "Fødselsdag",
+"Nickname" => "Kaldenavn",
+"Enter nickname" => "Indtast kaldenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Opdel gruppenavne med kommaer",
@@ -93,25 +114,20 @@
 "View on map" => "Vis på kort",
 "Edit address details" => "Rediger adresse detaljer",
 "Add notes here." => "Tilføj noter her.",
-"Add field" => "Tilfæj element",
-"Profile picture" => "Profilbillede",
+"Add field" => "Tilføj element",
 "Phone" => "Telefon",
 "Note" => "Note",
-"Delete current photo" => "Slet nuværende foto",
-"Edit current photo" => "Rediger nuværende foto",
-"Upload new photo" => "Upload nyt foto",
-"Select photo from ownCloud" => "Vælg foto fra ownCloud",
+"Download contact" => "Download kontaktperson",
+"Delete contact" => "Slet kontaktperson",
+"The temporary image has been removed from cache." => "Det midlertidige billede er ikke længere tilgængeligt.",
 "Edit address" => "Rediger adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
-"Street" => "Vej",
 "City" => "By",
 "Region" => "Region",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Edit categories" => "Rediger grupper",
-"Add" => "Tilføj",
 "Addressbook" => "Adressebog",
 "Hon. prefixes" => "Foranstillede titler",
 "Miss" => "Frøken",
@@ -119,7 +135,7 @@
 "Mr" => "Hr.",
 "Sir" => "Sir",
 "Mrs" => "Fru",
-"Dr" => "Dr",
+"Dr" => "Dr.",
 "Given name" => "Fornavn",
 "Additional names" => "Mellemnavne",
 "Family name" => "Efternavn",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Vælg venligst adressebog",
 "create a new addressbook" => "Opret ny adressebog",
 "Name of new addressbook" => "Navn på ny adressebog",
-"Import" => "Importer",
 "Importing contacts" => "Importerer kontaktpersoner",
-"Select address book to import to:" => "Vælg hvilken adressebog, der skal importeres til:",
-"Select from HD" => "Vælg fra harddisk.",
 "You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
 "Add contact" => "Tilføj kontaktpeson.",
 "Configure addressbooks" => "Konfigurer adressebøger",
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index ffc885a41a5a48e5decbc5b323f4c5aca7422e0c..e62077fe5d399dc48e23c9f15dbbd2d81f982357 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
 "There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
+"element name is not set." => "eronomo ne agordiĝis.",
+"id is not set." => "identigilo ne agordiĝis.",
 "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:",
-"Error adding contact property." => "Eraro dum aldono de kontaktopropraĵo.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
 "Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
@@ -12,34 +13,50 @@
 "No contacts found." => "Neniu kontakto troviĝis.",
 "Missing ID" => "Mankas identigilo",
 "Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
-"Cannot add addressbook with an empty name." => "Ne eblas aldoni adresaron kun malplena nomo.",
-"Error adding addressbook." => "Eraro dum aldono de adresaro.",
-"Error activating addressbook." => "Eraro dum aktivigo de adresaro.",
 "No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
 "Error reading contact photo." => "Eraro dum lego de kontakta foto.",
 "Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
 "The loading photo is not valid." => "La alŝutata foto ne validas.",
-"id is not set." => "identigilo ne agordiĝis.",
 "Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
 "Error deleting contact property." => "Eraro dum forigo de kontaktopropraĵo.",
 "Contact ID is missing." => "Kontaktidentigilo mankas.",
-"Missing contact id." => "Mankas kontaktidentigilo.",
 "No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
 "File doesn't exist:" => "Dosiero ne ekzistas:",
 "Error loading image." => "Eraro dum ŝargado de bildo.",
-"element name is not set." => "eronomo ne agordiĝis.",
+"Error getting contact object." => "Eraro dum ekhaviĝis kontakta objekto.",
+"Error getting PHOTO property." => "Eraro dum ekhaviĝis la propraĵon PHOTO.",
+"Error saving contact." => "Eraro dum konserviĝis kontakto.",
+"Error resizing image" => "Eraro dum aligrandiĝis bildo",
+"Error cropping image" => "Eraro dum stuciĝis bildo.",
+"Error creating temporary image" => "Eraro dum kreiĝis provizora bildo.",
+"Error finding image: " => "Eraro dum serĉo de bildo: ",
 "checksum is not set." => "kontrolsumo ne agordiĝis.",
 "Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
 "Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
 "Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
 "Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
+"Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
+"Couldn't save temporary image: " => "Ne eblis konservi provizoran bildon: ",
+"Couldn't load temporary image: " => "Ne eblis ŝargi provizoran bildon: ",
+"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
 "Contacts" => "Kontaktoj",
-"Drop a VCF file to import contacts." => "Demetu VCF-dosieron por enporti kontaktojn.",
+"Sorry, this functionality has not been implemented yet" => "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita.",
+"Not implemented" => "Ne disponebla",
+"Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
+"Error" => "Eraro",
+"Contact" => "Kontakto",
+"This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
+"Edit name" => "Redakti nomon",
+"No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
+"Select type" => "Elektu tipon",
+"Result: " => "Rezulto: ",
+" imported, " => " enportoj, ",
+" failed." => "malsukcesoj.",
 "Addressbook not found." => "Adresaro ne troviĝis.",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
@@ -57,25 +74,27 @@
 "Video" => "Videaĵo",
 "Pager" => "Televokilo",
 "Internet" => "Interreto",
+"Birthday" => "Naskiĝotago",
 "{name}'s Birthday" => "Naskiĝtago de {name}",
-"Contact" => "Kontakto",
 "Add Contact" => "Aldoni kontakton",
+"Import" => "Enporti",
 "Addressbooks" => "Adresaroj",
+"Close" => "Fermi",
 "Configure Address Books" => "Agordi adresarojn",
 "New Address Book" => "Nova adresaro",
-"Import from VCF" => "Enporti el VCF",
 "CardDav Link" => "CardDav-ligilo",
 "Download" => "Elŝuti",
 "Edit" => "Redakti",
 "Delete" => "Forigi",
-"Download contact" => "Elŝuti kontakton",
-"Delete contact" => "Forigi kontakton",
 "Drop photo to upload" => "Demeti foton por alŝuti",
+"Delete current photo" => "Forigi nunan foton",
+"Edit current photo" => "Redakti nunan foton",
+"Upload new photo" => "Alŝuti novan foton",
+"Select photo from ownCloud" => "Elekti foton el ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo",
 "Edit name details" => "Redakti detalojn de nomo",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
-"Birthday" => "Naskiĝotago",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Grupoj",
 "Separate groups with commas" => "Disigi grupojn per komoj",
@@ -91,24 +110,19 @@
 "Edit address details" => "Redakti detalojn de adreso",
 "Add notes here." => "Aldoni notojn ĉi tie.",
 "Add field" => "Aldoni kampon",
-"Profile picture" => "Profila bildo",
 "Phone" => "Telefono",
 "Note" => "Noto",
-"Delete current photo" => "Forigi nunan foton",
-"Edit current photo" => "Redakti nunan foton",
-"Upload new photo" => "Alŝuti novan foton",
-"Select photo from ownCloud" => "Elekti foton el ownCloud",
+"Download contact" => "Elŝuti kontakton",
+"Delete contact" => "Forigi kontakton",
+"The temporary image has been removed from cache." => "La provizora bildo estas forigita de la kaŝmemoro.",
 "Edit address" => "Redakti adreson",
 "Type" => "Tipo",
 "PO Box" => "Abonkesto",
 "Extended" => "Etendita",
-"Street" => "Strato",
 "City" => "Urbo",
 "Region" => "Regiono",
 "Zipcode" => "Poŝtokodo",
 "Country" => "Lando",
-"Edit categories" => "Redakti kategoriojn",
-"Add" => "Aldoni",
 "Addressbook" => "Adresaro",
 "Hon. prefixes" => "Honoraj antaŭmetaĵoj",
 "Miss" => "f-ino",
@@ -132,10 +146,7 @@
 "Please choose the addressbook" => "Bonvolu elekti adresaron",
 "create a new addressbook" => "krei novan adresaron",
 "Name of new addressbook" => "Nomo de nova adresaro",
-"Import" => "Enporti",
 "Importing contacts" => "Enportante kontaktojn",
-"Select address book to import to:" => "Elektu adresaron kien enporti:",
-"Select from HD" => "Elekti el malmoldisko",
 "You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
 "Add contact" => "Aldoni kontakton",
 "Configure addressbooks" => "Agordi adresarojn",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 2bdb300aa8fbb0f44b290aca20785dd0ecd2b14a..813cedc6e8a8585e1e8f5bc67975b59571051433 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
 "There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
+"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"id is not set." => "no se ha puesto ninguna ID.",
 "Cannot add empty property." => "No se puede añadir una propiedad vacía.",
 "At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
 "Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
-"Error adding contact property." => "Error al añadir una propiedad del contacto.",
 "No ID provided" => "No se ha proporcionado una ID",
 "Error setting checksum." => "Error al establecer la suma de verificación.",
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
@@ -12,22 +13,23 @@
 "No contacts found." => "No se encontraron contactos.",
 "Missing ID" => "Falta la ID",
 "Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
-"Cannot add addressbook with an empty name." => "No se puede añadir una libreta de direcciones sin nombre",
-"Error adding addressbook." => "Error al añadir la libreta de direcciones.",
-"Error activating addressbook." => "Error al activar la libreta de direcciones.",
 "No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
 "Error reading contact photo." => "Error leyendo fotografía del contacto.",
 "Error saving temporary file." => "Error al guardar archivo temporal.",
 "The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
-"id is not set." => "no se ha puesto ninguna ID.",
 "Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
 "Error deleting contact property." => "Error al borrar una propiedad del contacto.",
 "Contact ID is missing." => "Falta la ID del contacto.",
-"Missing contact id." => "Falta la id del contacto.",
 "No photo path was submitted." => "No se ha introducido la ruta de la foto.",
 "File doesn't exist:" => "Archivo inexistente:",
 "Error loading image." => "Error cargando imagen.",
-"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"Error getting contact object." => "Fallo al coger el contacto.",
+"Error getting PHOTO property." => "Fallo al coger las propiedades de la foto .",
+"Error saving contact." => "Fallo al salvar un contacto",
+"Error resizing image" => "Fallo al cambiar de tamaño una foto",
+"Error cropping image" => "Fallo al cortar el tamaño de la foto",
+"Error creating temporary image" => "Fallo al crear la foto temporal",
+"Error finding image: " => "Fallo al encontrar la imagen",
 "checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
 "Something went FUBAR. " => "Plof. Algo ha fallado.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
 "No file was uploaded" => "No se ha subido ningún archivo",
 "Missing a temporary folder" => "Falta la carpeta temporal",
+"Couldn't save temporary image: " => "Fallo no pudo salvar a una imagen temporal",
+"Couldn't load temporary image: " => "Fallo no pudo cargara de una imagen temporal",
+"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
 "Contacts" => "Contactos",
-"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
+"Sorry, this functionality has not been implemented yet" => "Perdón esta función no esta aún implementada",
+"Not implemented" => "No esta implementada",
+"Couldn't get a valid address." => "Fallo : no hay dirección valida",
+"Error" => "Fallo",
+"Contact" => "Contacto",
+"This property has to be non-empty." => "Este campo no puede estar vacío.",
+"Couldn't serialize elements." => "Fallo no podido ordenar los elementos",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org",
+"Edit name" => "Edita el Nombre",
+"No files selected for upload." => "No hay ficheros seleccionados para subir",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fichero que quieres subir excede el tamaño máximo permitido en este servidor.",
+"Select type" => "Selecciona el tipo",
+"Result: " => "Resultado :",
+" imported, " => "Importado.",
+" failed." => "Fallo.",
 "Addressbook not found." => "Libreta de direcciones no encontrada.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
@@ -60,25 +79,27 @@
 "Video" => "Vídeo",
 "Pager" => "Localizador",
 "Internet" => "Internet",
+"Birthday" => "Cumpleaños",
 "{name}'s Birthday" => "Cumpleaños de {name}",
-"Contact" => "Contacto",
 "Add Contact" => "Añadir contacto",
+"Import" => "Importar",
 "Addressbooks" => "Libretas de direcciones",
+"Close" => "Cierra.",
 "Configure Address Books" => "Configurar libretas de direcciones",
 "New Address Book" => "Nueva libreta de direcciones",
-"Import from VCF" => "Importar desde VCF",
 "CardDav Link" => "Enlace CardDav",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Borrar",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Eliminar contacto",
 "Drop photo to upload" => "Suelta una foto para subirla",
+"Delete current photo" => "Eliminar fotografía actual",
+"Edit current photo" => "Editar fotografía actual",
+"Upload new photo" => "Subir nueva fotografía",
+"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma",
 "Edit name details" => "Editar los detalles del nombre",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
-"Birthday" => "Cumpleaños",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separa los grupos con comas",
@@ -94,24 +115,19 @@
 "Edit address details" => "Editar detalles de la dirección",
 "Add notes here." => "Añade notas aquí.",
 "Add field" => "Añadir campo",
-"Profile picture" => "Foto del perfil",
 "Phone" => "Teléfono",
 "Note" => "Nota",
-"Delete current photo" => "Eliminar fotografía actual",
-"Edit current photo" => "Editar fotografía actual",
-"Upload new photo" => "Subir nueva fotografía",
-"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Eliminar contacto",
+"The temporary image has been removed from cache." => "La foto temporal se ha borrado del cache.",
 "Edit address" => "Editar dirección",
 "Type" => "Tipo",
 "PO Box" => "Código postal",
 "Extended" => "Extendido",
-"Street" => "Calle",
 "City" => "Ciudad",
 "Region" => "Región",
 "Zipcode" => "Código postal",
 "Country" => "País",
-"Edit categories" => "Editar categorías",
-"Add" => "Añadir",
 "Addressbook" => "Libreta de direcciones",
 "Hon. prefixes" => "Prefijos honoríficos",
 "Miss" => "Srta",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Por favor escoge la agenda",
 "create a new addressbook" => "crear una nueva agenda",
 "Name of new addressbook" => "Nombre de la nueva agenda",
-"Import" => "Importar",
 "Importing contacts" => "Importando contactos",
-"Select address book to import to:" => "Selecciona una agenda para importar a:",
-"Select from HD" => "Seleccionar del disco duro",
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
 "Configure addressbooks" => "Configurar agenda",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 39a287c9619bb76890ada0c3e524ee015bcc1312..08b110ca2328044623053afc311027fb0786c80e 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
 "There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
+"element name is not set." => "elemendi nime pole määratud.",
+"id is not set." => "ID on määramata.",
 "Cannot add empty property." => "Tühja omadust ei saa lisada.",
 "At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
 "Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
-"Error adding contact property." => "Viga konktakti korralikul lisamisel.",
 "No ID provided" => "ID-d pole sisestatud",
 "Error setting checksum." => "Viga kontrollsumma määramisel.",
 "No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Ühtegi kontakti ei leitud.",
 "Missing ID" => "Puudub ID",
 "Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
-"Cannot add addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa lisada.",
-"Error adding addressbook." => "Viga aadressiraamatu lisamisel.",
-"Error activating addressbook." => "Viga aadressiraamatu aktiveerimisel.",
 "No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
 "Error reading contact photo." => "Viga kontakti foto lugemisel.",
 "Error saving temporary file." => "Viga ajutise faili salvestamisel.",
 "The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
-"id is not set." => "ID on määramata.",
 "Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
 "Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
 "Contact ID is missing." => "Kontakti ID puudub.",
-"Missing contact id." => "Puuduv kontakti ID.",
 "No photo path was submitted." => "Foto asukohta pole määratud.",
 "File doesn't exist:" => "Faili pole olemas:",
 "Error loading image." => "Viga pildi laadimisel.",
-"element name is not set." => "elemendi nime pole määratud.",
+"Error getting contact object." => "Viga kontakti objekti hankimisel.",
+"Error getting PHOTO property." => "Viga PHOTO omaduse hankimisel.",
+"Error saving contact." => "Viga kontakti salvestamisel.",
+"Error resizing image" => "Viga pildi suuruse muutmisel",
+"Error cropping image" => "Viga pildi lõikamisel",
+"Error creating temporary image" => "Viga ajutise pildi loomisel",
+"Error finding image: " => "Viga pildi leidmisel: ",
 "checksum is not set." => "kontrollsummat pole määratud.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
 "Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
@@ -41,8 +43,22 @@
 "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
+"Couldn't save temporary image: " => "Ajutise pildi salvestamine ebaõnnestus: ",
+"Couldn't load temporary image: " => "Ajutise pildi laadimine ebaõnnestus: ",
+"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
 "Contacts" => "Kontaktid",
-"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
+"Sorry, this functionality has not been implemented yet" => "Vabandust, aga see funktsioon pole veel valmis",
+"Not implemented" => "Pole implementeeritud",
+"Couldn't get a valid address." => "Kehtiva aadressi hankimine ebaõnnestus",
+"Error" => "Viga",
+"Contact" => "Kontakt",
+"This property has to be non-empty." => "See omadus ei tohi olla tühi.",
+"Edit name" => "Muuda nime",
+"No files selected for upload." => "Üleslaadimiseks pole faile valitud.",
+"Select type" => "Vali tüüp",
+"Result: " => "Tulemus: ",
+" imported, " => " imporditud, ",
+" failed." => " ebaõnnestus.",
 "Addressbook not found." => "Aadressiraamatut ei leitud",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
@@ -60,25 +76,27 @@
 "Video" => "Video",
 "Pager" => "Piipar",
 "Internet" => "Internet",
+"Birthday" => "Sünnipäev",
 "{name}'s Birthday" => "{name} sünnipäev",
-"Contact" => "Kontakt",
 "Add Contact" => "Lisa kontakt",
+"Import" => "Impordi",
 "Addressbooks" => "Aadressiraamatud",
+"Close" => "Sule",
 "Configure Address Books" => "Seadista aadressiraamatut",
 "New Address Book" => "Uus aadressiraamat",
-"Import from VCF" => "Impordi VCF-ist",
 "CardDav Link" => "CardDav link",
 "Download" => "Lae alla",
 "Edit" => "Muuda",
 "Delete" => "Kustuta",
-"Download contact" => "Lae kontakt alla",
-"Delete contact" => "Kustuta kontakt",
 "Drop photo to upload" => "Lohista üleslaetav foto siia",
+"Delete current photo" => "Kustuta praegune foto",
+"Edit current photo" => "Muuda praegust pilti",
+"Upload new photo" => "Lae üles uus foto",
+"Select photo from ownCloud" => "Vali foto ownCloudist",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
 "Edit name details" => "Muuda nime üksikasju",
 "Nickname" => "Hüüdnimi",
 "Enter nickname" => "Sisesta hüüdnimi",
-"Birthday" => "Sünnipäev",
 "dd-mm-yyyy" => "dd.mm.yyyy",
 "Groups" => "Grupid",
 "Separate groups with commas" => "Eralda grupid komadega",
@@ -94,24 +112,19 @@
 "Edit address details" => "Muuda aaressi infot",
 "Add notes here." => "Lisa märkmed siia.",
 "Add field" => "Lisa väli",
-"Profile picture" => "Profiili pilt",
 "Phone" => "Telefon",
 "Note" => "Märkus",
-"Delete current photo" => "Kustuta praegune foto",
-"Edit current photo" => "Muuda praegust pilti",
-"Upload new photo" => "Lae üles uus foto",
-"Select photo from ownCloud" => "Vali foto ownCloudist",
+"Download contact" => "Lae kontakt alla",
+"Delete contact" => "Kustuta kontakt",
+"The temporary image has been removed from cache." => "Ajutine pilt on puhvrist eemaldatud.",
 "Edit address" => "Muuda aadressi",
 "Type" => "Tüüp",
 "PO Box" => "Postkontori postkast",
 "Extended" => "Laiendatud",
-"Street" => "Tänav",
 "City" => "Linn",
 "Region" => "Piirkond",
 "Zipcode" => "Postiindeks",
 "Country" => "Riik",
-"Edit categories" => "Muuda kategooriat",
-"Add" => "Lisa",
 "Addressbook" => "Aadressiraamat",
 "Hon. prefixes" => "Eesliited",
 "Miss" => "Preili",
@@ -143,10 +156,7 @@
 "Please choose the addressbook" => "Palun vali aadressiraamat",
 "create a new addressbook" => "loo uus aadressiraamat",
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
-"Import" => "Impordi",
 "Importing contacts" => "Kontaktide importimine",
-"Select address book to import to:" => "Vali aadressiraamat, millesse importida:",
-"Select from HD" => "Vali kõvakettalt",
 "You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
 "Add contact" => "Lisa kontakt",
 "Configure addressbooks" => "Seadista aadressiraamatuid",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 6dfbf0a7b235c99ccdd68e6f672cdb3f9c591f6b..3e78c84d39c7d67a57a67b6ce7d227cca14ac7b6 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -1,35 +1,66 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
 "There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
+"element name is not set." => "elementuaren izena ez da ezarri.",
+"id is not set." => "IDa ez da ezarri.",
 "Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
 "At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
-"Error adding contact property." => "Errorea kontaktu propietatea gehitzean.",
+"Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
 "No ID provided" => "Ez da IDrik eman",
+"Error setting checksum." => "Errorea kontrol-batura ezartzean.",
 "No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
 "No address books found." => "Ez da helbide libururik aurkitu.",
 "No contacts found." => "Ez da kontakturik aurkitu.",
 "Missing ID" => "ID falta da",
-"Error adding addressbook." => "Errore bat egon da helbide liburua gehitzean.",
-"Error activating addressbook." => "Errore bat egon da helbide-liburua aktibatzen.",
+"Error parsing VCard for ID: \"" => "Errorea VCard analizatzean hurrengo IDrako: \"",
+"No contact ID was submitted." => "Ez da kontaktuaren IDrik eman.",
 "Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
+"Error saving temporary file." => "Errore bat izan da aldi bateko fitxategia gordetzerakoan.",
 "The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
-"id is not set." => "IDa ez da ezarri.",
 "Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
 "Error deleting contact property." => "Errorea kontaktu propietatea ezabatzean.",
 "Contact ID is missing." => "Kontaktuaren IDa falta da.",
-"Missing contact id." => "Kontaktuaren IDa falta da.",
+"No photo path was submitted." => "Ez da argazkiaren bide-izenik eman.",
 "File doesn't exist:" => "Fitxategia ez da existitzen:",
 "Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
-"element name is not set." => "elementuaren izena ez da ezarri.",
+"Error getting contact object." => "Errore bat izan da kontaktu objetua lortzean.",
+"Error getting PHOTO property." => "Errore bat izan da PHOTO propietatea lortzean.",
+"Error saving contact." => "Errore bat izan da kontaktua gordetzean.",
+"Error resizing image" => "Errore bat izan da irudiaren tamaina aldatzean",
+"Error cropping image" => "Errore bat izan da irudia mozten",
+"Error creating temporary image" => "Errore bat izan da aldi bateko irudia sortzen",
+"Error finding image: " => "Ezin izan da irudia aurkitu:",
+"checksum is not set." => "Kontrol-batura ezarri gabe dago.",
+"Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
 "Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
 "Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
 "Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
 "Error uploading contacts to storage." => "Errore bat egon da kontaktuak biltegira igotzerakoan.",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
 "No file was uploaded" => "Ez da fitxategirik igo",
+"Missing a temporary folder" => "Aldi bateko karpeta falta da",
+"Couldn't save temporary image: " => "Ezin izan da aldi bateko irudia gorde:",
+"Couldn't load temporary image: " => "Ezin izan da aldi bateko irudia kargatu:",
+"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "Contacts" => "Kontaktuak",
-"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
+"Sorry, this functionality has not been implemented yet" => "Barkatu, aukera hau ez da oriandik inplementatu",
+"Not implemented" => "Inplementatu gabe",
+"Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
+"Error" => "Errorea",
+"Contact" => "Kontaktua",
+"This property has to be non-empty." => "Propietate hau ezin da hutsik egon.",
+"Couldn't serialize elements." => "Ezin izan dira elementuak serializatu.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en",
+"Edit name" => "Editatu izena",
+"No files selected for upload." => "Ez duzu igotzeko fitxategirik hautatu.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da.",
+"Select type" => "Hautatu mota",
+"Result: " => "Emaitza:",
+" imported, " => " inportatua, ",
+" failed." => "huts egin du.",
 "Addressbook not found." => "Helbide liburua ez da aurkitu",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
@@ -47,24 +78,26 @@
 "Video" => "Bideoa",
 "Pager" => "Bilagailua",
 "Internet" => "Internet",
+"Birthday" => "Jaioteguna",
 "{name}'s Birthday" => "{name}ren jaioteguna",
-"Contact" => "Kontaktua",
 "Add Contact" => "Gehitu kontaktua",
+"Import" => "Inportatu",
 "Addressbooks" => "Helbide Liburuak",
+"Close" => "Itxi",
 "Configure Address Books" => "Konfiguratu Helbide Liburuak",
 "New Address Book" => "Helbide-liburu berria",
-"Import from VCF" => "VCFtik inportatu",
 "CardDav Link" => "CardDav lotura",
 "Download" => "Deskargatu",
 "Edit" => "Editatu",
 "Delete" => "Ezabatu",
-"Download contact" => "Deskargatu kontaktua",
-"Delete contact" => "Ezabatu kontaktua",
 "Drop photo to upload" => "Askatu argazkia igotzeko",
+"Delete current photo" => "Ezabatu oraingo argazkia",
+"Edit current photo" => "Editatu oraingo argazkia",
+"Upload new photo" => "Igo argazki berria",
+"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
 "Edit name details" => "Editatu izenaren zehaztasunak",
 "Nickname" => "Ezizena",
 "Enter nickname" => "Sartu ezizena",
-"Birthday" => "Jaioteguna",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Taldeak",
 "Separate groups with commas" => "Banatu taldeak komekin",
@@ -80,24 +113,19 @@
 "Edit address details" => "Editatu helbidearen zehaztasunak",
 "Add notes here." => "Gehitu oharrak hemen.",
 "Add field" => "Gehitu eremua",
-"Profile picture" => "Profilaren irudia",
 "Phone" => "Telefonoa",
 "Note" => "Oharra",
-"Delete current photo" => "Ezabatu oraingo argazkia",
-"Edit current photo" => "Editatu oraingo argazkia",
-"Upload new photo" => "Igo argazki berria",
-"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
+"Download contact" => "Deskargatu kontaktua",
+"Delete contact" => "Ezabatu kontaktua",
+"The temporary image has been removed from cache." => "Aldi bateko irudia cachetik ezabatu da.",
 "Edit address" => "Editatu helbidea",
 "Type" => "Mota",
 "PO Box" => "Posta kutxa",
 "Extended" => "Hedatua",
-"Street" => "Kalea",
 "City" => "Hiria",
 "Region" => "Eskualdea",
 "Zipcode" => "Posta kodea",
 "Country" => "Herrialdea",
-"Edit categories" => "Editatu kategoriak",
-"Add" => "Gehitu",
 "Addressbook" => "Helbide-liburua",
 "New Addressbook" => "Helbide-liburu berria",
 "Edit Addressbook" => "Editatu helbide-liburua",
@@ -110,10 +138,7 @@
 "Please choose the addressbook" => "Mesedez, aukeratu helbide liburua",
 "create a new addressbook" => "sortu helbide liburu berria",
 "Name of new addressbook" => "Helbide liburuaren izena",
-"Import" => "Inportatu",
 "Importing contacts" => "Kontaktuak inportatzen",
-"Select address book to import to:" => "Hautau helburuko helbide liburua:",
-"Select from HD" => "Hautatu disko gogorretik",
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
 "Configure addressbooks" => "Konfiguratu helbide liburuak",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 9278975c4070ae9b702833ab9b5cf52d06be5440..08b4eb221bd673910320807aecceec2d15fdbd64 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
 "There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
+"element name is not set." => "نام اصلی تنظیم نشده است",
+"id is not set." => "شناسه تعیین نشده",
 "Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
 "At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
 "Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
-"Error adding contact property." => "خطا درهنگام افزودن ویژگی",
 "No ID provided" => "هیچ شناسه ای ارائه نشده",
 "Error setting checksum." => "خطا در تنظیم checksum",
 "No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
@@ -12,22 +13,23 @@
 "No contacts found." => "هیچ شخصی پیدا نشد",
 "Missing ID" => "نشانی گم شده",
 "Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
-"Cannot add addressbook with an empty name." => "نمیتوانید یک نام خالی را به کتابچه نشانی ها افزود",
-"Error adding addressbook." => "خطا درهنگام افزودن کتابچه نشانی ها",
-"Error activating addressbook." => "خطا درهنگام فعال سازیکتابچه نشانی ها",
 "No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
 "Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
 "Error saving temporary file." => "خطا در ذخیره پرونده موقت",
 "The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
-"id is not set." => "شناسه تعیین نشده",
 "Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
 "Error deleting contact property." => "خطا در هنگام پاک کرد ویژگی",
 "Contact ID is missing." => "اطلاعات شناسه گم شده",
-"Missing contact id." => "شما اطلاعات شناسه را فراموش کرده اید",
 "No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
 "File doesn't exist:" => "پرونده وجود ندارد",
 "Error loading image." => "خطا در بارگزاری تصویر",
-"element name is not set." => "نام اصلی تنظیم نشده است",
+"Error getting contact object." => "خطا در گرفتن اطلاعات شخص",
+"Error getting PHOTO property." => "خطا در دربافت تصویر ویژگی شخصی",
+"Error saving contact." => "خطا در ذخیره سازی اطلاعات",
+"Error resizing image" => "خطا در تغییر دادن اندازه تصویر",
+"Error cropping image" => "خطا در برداشت تصویر",
+"Error creating temporary image" => "خطا در ساخت تصویر  temporary",
+"Error finding image: " => "خطا در پیدا کردن تصویر:",
 "checksum is not set." => "checksum تنظیم شده نیست",
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
 "Something went FUBAR. " => "چند چیز به FUBAR رفتند",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
 "No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
 "Missing a temporary folder" => "یک پوشه موقت گم شده",
+"Couldn't save temporary image: " => "قابلیت ذخیره تصویر  موقت وجود ندارد:",
+"Couldn't load temporary image: " => "قابلیت بارگذاری تصویر  موقت وجود ندارد:",
+"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
 "Contacts" => "اشخاص",
-"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
+"Sorry, this functionality has not been implemented yet" => "با عرض پوزش،این قابلیت هنوز اجرا نشده است",
+"Not implemented" => "انجام نشد",
+"Couldn't get a valid address." => "Couldn't get a valid address.",
+"Error" => "خطا",
+"Contact" => "اشخاص",
+"This property has to be non-empty." => "این ویژگی باید به صورت غیر تهی عمل کند",
+"Couldn't serialize elements." => "قابلیت مرتب سازی عناصر وجود ندارد",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org",
+"Edit name" => "نام تغییر",
+"No files selected for upload." => "هیچ فایلی برای آپلود انتخاب نشده است",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است",
+"Select type" => "نوع را انتخاب کنید",
+"Result: " => "نتیجه:",
+" imported, " => "وارد شد،",
+" failed." => "ناموفق",
 "Addressbook not found." => "کتابچه نشانی ها یافت نشد",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
@@ -60,25 +79,27 @@
 "Video" => "رسانه تصویری",
 "Pager" => "صفحه",
 "Internet" => "اینترنت",
+"Birthday" => "روزتولد",
 "{name}'s Birthday" => "روز تولد {name} است",
-"Contact" => "اشخاص",
 "Add Contact" => "افزودن اطلاعات شخص مورد نظر",
+"Import" => "وارد کردن",
 "Addressbooks" => "کتابچه ی نشانی ها",
+"Close" => "بستن",
 "Configure Address Books" => "پیکر بندی کتابچه نشانی ها",
 "New Address Book" => "کتابچه نشانه های جدید",
-"Import from VCF" => "وارد شده از VCF",
 "CardDav Link" => "CardDav Link",
 "Download" => "بارگیری",
 "Edit" => "ویرایش",
 "Delete" => "پاک کردن",
-"Download contact" => "دانلود مشخصات اشخاص",
-"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
 "Drop photo to upload" => "تصویر را به اینجا بکشید تا بار گذازی شود",
+"Delete current photo" => "پاک کردن تصویر کنونی",
+"Edit current photo" => "ویرایش تصویر کنونی",
+"Upload new photo" => "بار گذاری یک تصویر جدید",
+"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "ویرایش نام جزئیات",
 "Nickname" => "نام مستعار",
 "Enter nickname" => "یک نام مستعار وارد کنید",
-"Birthday" => "روزتولد",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "گروه ها",
 "Separate groups with commas" => "جدا کردن گروه ها به وسیله درنگ نما",
@@ -94,24 +115,19 @@
 "Edit address details" => "ویرایش جزئیات نشانی ها",
 "Add notes here." => "اینجا یادداشت ها را بیافزایید",
 "Add field" => "اضافه کردن فیلد",
-"Profile picture" => "تصویر پروفایل",
 "Phone" => "شماره تلفن",
 "Note" => "یادداشت",
-"Delete current photo" => "پاک کردن تصویر کنونی",
-"Edit current photo" => "ویرایش تصویر کنونی",
-"Upload new photo" => "بار گذاری یک تصویر جدید",
-"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
+"Download contact" => "دانلود مشخصات اشخاص",
+"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
+"The temporary image has been removed from cache." => "تصویر موقت از کش پاک شد.",
 "Edit address" => "ویرایش نشانی",
 "Type" => "نوع",
 "PO Box" => "صندوق پستی",
 "Extended" => "تمدید شده",
-"Street" => "خیابان",
 "City" => "شهر",
 "Region" => "ناحیه",
 "Zipcode" => "کد پستی",
 "Country" => "کشور",
-"Edit categories" => "ویرایش گروه",
-"Add" => "افزودن",
 "Addressbook" => "کتابچه ی نشانی ها",
 "Hon. prefixes" => "پیشوند های محترمانه",
 "Miss" => "خانم",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "لطفا یک کتابچه نشانی انتخاب کنید",
 "create a new addressbook" => "یک کتابچه نشانی بسازید",
 "Name of new addressbook" => "نام کتابچه نشانی جدید",
-"Import" => "وارد کردن",
 "Importing contacts" => "وارد کردن اشخاص",
-"Select address book to import to:" => "یک کتابچه نشانی انتخاب کنید تا وارد شود",
-"Select from HD" => "انتخاب از دیسک سخت",
 "You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
 "Add contact" => "افزودن اطلاعات شخص مورد نظر",
 "Configure addressbooks" => "پیکربندی کتابچه ی نشانی ها",
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index bc3ec7449c99fea124beb6a88f597dcac4178a50..a822b55469c623039db65efe505daabc14663ebc 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -1,16 +1,67 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
 "There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
+"element name is not set." => "non se nomeou o elemento.",
+"id is not set." => "non se estableceu o id.",
 "Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
 "At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
-"Error adding contact property." => "Produciuse un erro engadindo unha propiedade do contacto.",
-"Error adding addressbook." => "Produciuse un erro engadindo a axenda.",
-"Error activating addressbook." => "Produciuse un erro activando a axenda.",
+"Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
+"No ID provided" => "Non se proveeu ID",
+"Error setting checksum." => "Erro establecendo a suma de verificación",
+"No categories selected for deletion." => "Non se seleccionaron categorías para borrado.",
+"No address books found." => "Non se atoparon libretas de enderezos.",
+"No contacts found." => "Non se atoparon contactos.",
+"Missing ID" => "ID perdido",
+"Error parsing VCard for ID: \"" => "Erro procesando a VCard para o ID: \"",
+"No contact ID was submitted." => "Non se enviou ningún ID de contacto.",
+"Error reading contact photo." => "Erro lendo a fotografía do contacto.",
+"Error saving temporary file." => "Erro gardando o ficheiro temporal.",
+"The loading photo is not valid." => "A fotografía cargada non é válida.",
 "Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
 "Error deleting contact property." => "Produciuse un erro borrando a propiedade do contacto.",
+"Contact ID is missing." => "Falta o ID do contacto.",
+"No photo path was submitted." => "Non se enviou a ruta a unha foto.",
+"File doesn't exist:" => "O ficheiro non existe:",
+"Error loading image." => "Erro cargando imaxe.",
+"Error getting contact object." => "Erro obtendo o obxeto contacto.",
+"Error getting PHOTO property." => "Erro obtendo a propiedade PHOTO.",
+"Error saving contact." => "Erro gardando o contacto.",
+"Error resizing image" => "Erro cambiando o tamaño da imaxe",
+"Error cropping image" => "Erro recortando a imaxe",
+"Error creating temporary image" => "Erro creando a imaxe temporal",
+"Error finding image: " => "Erro buscando a imaxe: ",
+"checksum is not set." => "non se estableceu a suma de verificación.",
+"Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
 "Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
+"Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
 "Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
+"Error uploading contacts to storage." => "Erro subindo os contactos ao almacén.",
+"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro subeuse con éxito",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente subido",
+"No file was uploaded" => "Non se subeu ningún ficheiro",
+"Missing a temporary folder" => "Falta o cartafol temporal",
+"Couldn't save temporary image: " => "Non se puido gardar a imaxe temporal: ",
+"Couldn't load temporary image: " => "Non se puido cargar a imaxe temporal: ",
+"No file was uploaded. Unknown error" => "Non se subeu ningún ficheiro. Erro descoñecido.",
 "Contacts" => "Contactos",
+"Sorry, this functionality has not been implemented yet" => "Sentímolo, esta función aínda non foi implementada.",
+"Not implemented" => "Non implementada.",
+"Couldn't get a valid address." => "Non se puido obter un enderezo de correo válido.",
+"Error" => "Erro",
+"Contact" => "Contacto",
+"This property has to be non-empty." => "Esta propiedade non pode quedar baldeira.",
+"Couldn't serialize elements." => "Non se puido serializar os elementos.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Sen ficheiros escollidos para subir.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor.",
+"Select type" => "Seleccione tipo",
+"Result: " => "Resultado: ",
+" imported, " => " importado, ",
+" failed." => " fallou.",
+"Addressbook not found." => "Non se atopou a libreta de enderezos.",
 "This is not your addressbook." => "Esta non é a súa axenda.",
 "Contact could not be found." => "Non se atopou o contacto.",
 "Address" => "Enderezo",
@@ -22,37 +73,97 @@
 "Mobile" => "Móbil",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensaxe",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Paxinador",
-"Contact" => "Contacto",
+"Internet" => "Internet",
+"Birthday" => "Aniversario",
+"{name}'s Birthday" => "Cumpleanos de {name}",
 "Add Contact" => "Engadir contacto",
+"Import" => "Importar",
 "Addressbooks" => "Axendas",
+"Close" => "Pechar",
+"Configure Address Books" => "Configurar Libretas de enderezos",
 "New Address Book" => "Nova axenda",
 "CardDav Link" => "Ligazón CardDav",
 "Download" => "Descargar",
 "Edit" => "Editar",
 "Delete" => "Eliminar",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Borrar contacto",
-"Birthday" => "Aniversario",
+"Drop photo to upload" => "Solte a foto a subir",
+"Delete current photo" => "Borrar foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Upload new photo" => "Subir unha nova foto",
+"Select photo from ownCloud" => "Escoller foto desde ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma",
+"Edit name details" => "Editar detalles do nome",
+"Nickname" => "Apodo",
+"Enter nickname" => "Introuza apodo",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe grupos con comas",
+"Edit groups" => "Editar grupos",
 "Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor indique un enderezo de correo electrónico válido.",
+"Enter email address" => "Introduza enderezo de correo electrónico",
+"Mail to address" => "Correo ao enderezo",
+"Delete email address" => "Borrar enderezo de correo electrónico",
+"Enter phone number" => "Introducir número de teléfono",
+"Delete phone number" => "Borrar número de teléfono",
+"View on map" => "Ver no mapa",
+"Edit address details" => "Editar detalles do enderezo",
+"Add notes here." => "Engadir aquí as notas.",
+"Add field" => "Engadir campo",
 "Phone" => "Teléfono",
+"Note" => "Nota",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Borrar contacto",
+"The temporary image has been removed from cache." => "A imaxe temporal foi eliminada da caché.",
+"Edit address" => "Editar enderezo",
 "Type" => "Escribir",
 "PO Box" => "Apartado de correos",
 "Extended" => "Ampliado",
-"Street" => "Rúa",
 "City" => "Cidade",
 "Region" => "Autonomía",
 "Zipcode" => "Código postal",
 "Country" => "País",
-"Add" => "Engadir",
 "Addressbook" => "Axenda",
+"Hon. prefixes" => "Prefixos honoríficos",
+"Miss" => "Srta",
+"Ms" => "Sra/Srta",
+"Mr" => "Sr",
+"Sir" => "Sir",
+"Mrs" => "Sra",
+"Dr" => "Dr",
+"Given name" => "Apodo",
+"Additional names" => "Nomes adicionais",
+"Family name" => "Nome familiar",
+"Hon. suffixes" => "Sufixos honorarios",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Nova axenda",
 "Edit Addressbook" => "Editar axenda",
 "Displayname" => "Nome a mostrar",
 "Active" => "Activo",
 "Save" => "Gardar",
 "Submit" => "Enviar",
-"Cancel" => "Cancelar"
+"Cancel" => "Cancelar",
+"Import a contacts file" => "Importar un ficheiro de contactos",
+"Please choose the addressbook" => "Por favor escolla unha libreta de enderezos",
+"create a new addressbook" => "crear unha nova libreta de enderezos",
+"Name of new addressbook" => "Nome da nova libreta de enderezos",
+"Importing contacts" => "Importando contactos",
+"You have no contacts in your addressbook." => "Non ten contactos na súa libreta de enderezos.",
+"Add contact" => "Engadir contacto",
+"Configure addressbooks" => "Configurar libretas de enderezos",
+"CardDAV syncing addresses" => "Enderezos CardDAV a sincronizar",
+"more info" => "máis información",
+"Primary address (Kontact et al)" => "Enderezo primario (Kontact et al)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index 6e40ad71e1d731a39d095b2f066388985019f427..e4fffbbf72116bada9788c8024aa9b878e51490a 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,23 +1,48 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
 "There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
+"element name is not set." => "שם האלמנט לא נקבע.",
+"id is not set." => "מספר מזהה לא נקבע.",
 "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." => "שגיאה בהוספת מאפיין לאיש הקשר.",
 "No ID provided" => "לא צוין מזהה",
 "Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
 "No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
 "No address books found." => "לא נמצאו פנקסי כתובות.",
 "No contacts found." => "לא נמצאו אנשי קשר.",
 "Missing ID" => "מזהה חסר",
-"Error adding addressbook." => "שגיאה בהוספת פנקס הכתובות.",
-"Error activating addressbook." => "שגיאה בהפעלת פנקס הכתובות.",
+"Error parsing VCard for ID: \"" => "שגיאה בפענוח ה VCard עבור מספר המזהה: \"",
+"No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
+"Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
+"Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
+"The loading photo is not valid." => "התמונה הנטענת אינה תקנית.",
 "Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
 "Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
+"Contact ID is missing." => "מספר מזהה של אישר הקשר חסר.",
+"No photo path was submitted." => "כתובת התמונה לא נשלחה",
+"File doesn't exist:" => "קובץ לא קיים:",
+"Error loading image." => "שגיאה בטעינת התמונה.",
+"Error getting contact object." => "שגיאה בקבלת אוביאקט איש הקשר",
+"Error getting PHOTO property." => "שגיאה בקבלת מידע של תמונה",
+"Error saving contact." => "שגיאה בשמירת איש הקשר",
+"Error resizing image" => "שגיאה בשינוי גודל התמונה",
+"checksum is not set." => "סיכום ביקורת לא נקבע.",
+"Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
+"Something went FUBAR. " => "משהו לא התנהל כצפוי.",
 "Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
+"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
 "Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
+"Error uploading contacts to storage." => "התרשה שגיאה בהעלאת אנשי הקשר לאכסון.",
+"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
+"No file was uploaded" => "שום קובץ לא הועלה",
+"Missing a temporary folder" => "תקיה זמנית חסרה",
 "Contacts" => "אנשי קשר",
+"Contact" => "איש קשר",
+"Addressbook not found." => "ספר כתובות לא נמצא",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -29,37 +54,94 @@
 "Mobile" => "נייד",
 "Text" => "טקסט",
 "Voice" => "קולי",
+"Message" => "הודעה",
 "Fax" => "פקס",
 "Video" => "וידאו",
 "Pager" => "זימונית",
-"Contact" => "איש קשר",
+"Internet" => "אינטרנט",
+"Birthday" => "יום הולדת",
+"{name}'s Birthday" => "יום ההולדת של {name}",
 "Add Contact" => "הוספת איש קשר",
+"Import" => "יבא",
 "Addressbooks" => "פנקסי כתובות",
+"Configure Address Books" => "הגדר ספרי כתובות",
 "New Address Book" => "פנקס כתובות חדש",
 "CardDav Link" => "קישור ",
 "Download" => "הורדה",
 "Edit" => "עריכה",
 "Delete" => "מחיקה",
-"Download contact" => "הורדת איש קשר",
-"Delete contact" => "מחיקת איש קשר",
-"Birthday" => "יום הולדת",
+"Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
+"Delete current photo" => "מחק תמונה נוכחית",
+"Edit current photo" => "ערוך תמונה נוכחית",
+"Upload new photo" => "העלה תמונה חדשה",
+"Select photo from ownCloud" => "בחר תמונה מ ownCloud",
+"Edit name details" => "ערוך פרטי שם",
+"Nickname" => "כינוי",
+"Enter nickname" => "הכנס כינוי",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "קבוצות",
+"Separate groups with commas" => "הפרד קבוצות עם פסיקים",
+"Edit groups" => "ערוך קבוצות",
 "Preferred" => "מועדף",
+"Please specify a valid email address." => "אנא הזן כתובת דוא\"ל חוקית",
+"Enter email address" => "הזן כתובת דוא\"ל",
+"Mail to address" => "כתובת",
+"Delete email address" => "מחק כתובת דוא\"ל",
+"Enter phone number" => "הכנס מספר טלפון",
+"Delete phone number" => "מחק מספר טלפון",
+"View on map" => "ראה במפה",
+"Edit address details" => "ערוך פרטי כתובת",
+"Add notes here." => "הוסף הערות כאן.",
+"Add field" => "הוסף שדה",
 "Phone" => "טלפון",
+"Note" => "הערה",
+"Download contact" => "הורדת איש קשר",
+"Delete contact" => "מחיקת איש קשר",
+"Edit address" => "ערוך כתובת",
 "Type" => "סוג",
 "PO Box" => "תא דואר",
 "Extended" => "מורחב",
-"Street" => "רחוב",
 "City" => "עיר",
 "Region" => "אזור",
 "Zipcode" => "מיקוד",
 "Country" => "מדינה",
-"Add" => "הוספה",
 "Addressbook" => "פנקס כתובות",
+"Hon. prefixes" => "קידומות שם",
+"Miss" => "גב'",
+"Ms" => "גב'",
+"Mr" => "מר'",
+"Sir" => "אדון",
+"Mrs" => "גב'",
+"Dr" => "ד\"ר",
+"Given name" => "שם",
+"Additional names" => "שמות נוספים",
+"Family name" => "שם משפחה",
+"Hon. suffixes" => "סיומות שם",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "פנקס כתובות חדש",
 "Edit Addressbook" => "עריכת פנקס הכתובות",
 "Displayname" => "שם התצוגה",
 "Active" => "פעיל",
 "Save" => "שמירה",
 "Submit" => "ביצוע",
-"Cancel" => "ביטול"
+"Cancel" => "ביטול",
+"Import a contacts file" => "יבא קובץ אנשי קשר",
+"Please choose the addressbook" => "אנא בחר ספר כתובות",
+"create a new addressbook" => "צור ספר כתובות חדש",
+"Name of new addressbook" => "שם ספר כתובות החדש",
+"Importing contacts" => "מיבא אנשי קשר",
+"You have no contacts in your addressbook." => "איך לך אנשי קשר בספר הכתובות",
+"Add contact" => "הוסף איש קשר",
+"Configure addressbooks" => "הגדר ספרי כתובות",
+"CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
+"more info" => "מידע נוסף",
+"Primary address (Kontact et al)" => "כתובת ראשית",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index d381bf4fa9027be6b6c5f3f663198d283a419c80..c0ba8afbf6be2150fbbacc1ed388702158b00902 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,7 +1,44 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
+"There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
+"element name is not set." => "naziv elementa nije postavljen.",
+"id is not set." => "id nije postavljen.",
+"Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
+"At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
+"Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
+"No ID provided" => "Nema dodijeljenog ID identifikatora",
+"Error setting checksum." => "Pogreška pri postavljanju checksuma.",
+"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
+"No address books found." => "Nema adresara.",
+"No contacts found." => "Nema kontakata.",
+"Missing ID" => "Nedostupan ID identifikator",
+"Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
+"No contact ID was submitted." => "ID kontakta nije podnešen.",
+"Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
+"Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
+"The loading photo is not valid." => "Fotografija nije valjana.",
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
+"Error deleting contact property." => "Pogreška pri brisanju svojstva kontakta.",
+"Contact ID is missing." => "ID kontakta nije dostupan.",
+"No photo path was submitted." => "Putanja do fotografije nije podnešena.",
 "File doesn't exist:" => "Datoteka ne postoji:",
+"Error loading image." => "Pogreška pri učitavanju slike.",
+"checksum is not set." => "checksum nije postavljen.",
+"Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
+"Something went FUBAR. " => "Nešto je otišlo... krivo...",
+"Error updating contact property." => "Pogreška pri ažuriranju svojstva kontakta.",
+"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
+"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
+"Error uploading contacts to storage." => "Pogreška pri slanju kontakata.",
+"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
+"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
+"No file was uploaded" => "Datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Contacts" => "Kontakti",
+"Contact" => "Kontakt",
+"Addressbook not found." => "Adresar nije pronađen.",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
 "Address" => "Adresa",
@@ -13,26 +50,31 @@
 "Mobile" => "Mobitel",
 "Text" => "Tekst",
 "Voice" => "Glasovno",
+"Message" => "Poruka",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
-"Contact" => "Kontakt",
+"Internet" => "Internet",
+"Birthday" => "Rođendan",
+"{name}'s Birthday" => "{name} Rođendan",
 "Add Contact" => "Dodaj kontakt",
+"Import" => "Uvezi",
 "Addressbooks" => "Adresari",
+"Configure Address Books" => "Konfiguracija Adresara",
 "New Address Book" => "Novi adresar",
 "CardDav Link" => "CardDav poveznica",
 "Download" => "Preuzimanje",
 "Edit" => "Uredi",
 "Delete" => "Obriši",
-"Download contact" => "Preuzmi kontakt",
-"Delete contact" => "Izbriši kontakt",
+"Drop photo to upload" => "Dovucite fotografiju za slanje",
+"Edit current photo" => "Uredi trenutnu sliku",
 "Edit name details" => "Uredi detalje imena",
 "Nickname" => "Nadimak",
 "Enter nickname" => "Unesi nadimank",
-"Birthday" => "Rođendan",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupe",
 "Edit groups" => "Uredi grupe",
+"Preferred" => "Preferirano",
 "Enter email address" => "Unesi email adresu",
 "Enter phone number" => "Unesi broj telefona",
 "View on map" => "Prikaži na karti",
@@ -41,23 +83,22 @@
 "Add field" => "Dodaj polje",
 "Phone" => "Telefon",
 "Note" => "Bilješka",
-"Edit current photo" => "Uredi trenutnu sliku",
+"Download contact" => "Preuzmi kontakt",
+"Delete contact" => "Izbriši kontakt",
 "Edit address" => "Uredi adresu",
 "Type" => "Tip",
 "PO Box" => "Poštanski Pretinac",
 "Extended" => "Prošireno",
-"Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Poštanski broj",
 "Country" => "Država",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Addressbook" => "Adresar",
 "New Addressbook" => "Novi adresar",
 "Edit Addressbook" => "Uredi adresar",
+"Displayname" => "Prikazani naziv",
+"Active" => "Aktivno",
 "Save" => "Spremi",
 "Submit" => "Pošalji",
-"Cancel" => "Prekini",
-"Import" => "Uvezi"
+"Cancel" => "Prekini"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 68f7b2607eb5c629e3f3c6f1b73873e0df5a585f..5db680b1ac55e70d30ed517c68cd346b7c800544 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
 "There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
+"element name is not set." => "az elem neve nincs beállítva",
+"id is not set." => "ID nincs beállítva",
 "Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
 "At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
 "Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
-"Error adding contact property." => "Hiba a kapcsolat-tulajdonság hozzáadásakor",
 "No ID provided" => "Nincs ID megadva",
 "Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nem található kontakt",
 "Missing ID" => "Hiányzó ID",
 "Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
-"Cannot add addressbook with an empty name." => "Nem adható hozzá névtelen címlista",
-"Error adding addressbook." => "Hiba a címlista hozzáadásakor",
-"Error activating addressbook." => "Címlista aktiválása sikertelen",
 "No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
 "Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
 "Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
 "The loading photo is not valid." => "A kép érvénytelen",
-"id is not set." => "ID nincs beállítva",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
 "Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
 "Contact ID is missing." => "Hiányzik a kapcsolat ID",
-"Missing contact id." => "Hiányzik a kontakt ID",
 "No photo path was submitted." => "Nincs fénykép-útvonal megadva",
 "File doesn't exist:" => "A fájl nem létezik:",
 "Error loading image." => "Kép betöltése sikertelen",
-"element name is not set." => "az elem neve nincs beállítva",
+"Error getting contact object." => "A kontakt-objektum feldolgozása sikertelen",
+"Error getting PHOTO property." => "A PHOTO-tulajdonság  feldolgozása sikertelen",
+"Error saving contact." => "A kontakt mentése sikertelen",
+"Error resizing image" => "Képméretezés sikertelen",
+"Error cropping image" => "Képvágás sikertelen",
+"Error creating temporary image" => "Ideiglenes kép létrehozása sikertelen",
+"Error finding image: " => "A kép nem található",
 "checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
 "No file was uploaded" => "Nincs feltöltött fájl",
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
+"Couldn't save temporary image: " => "Ideiglenes kép létrehozása sikertelen",
+"Couldn't load temporary image: " => "Ideiglenes kép betöltése sikertelen",
+"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
 "Contacts" => "Kapcsolatok",
-"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kapcsolatok importálásához",
+"Sorry, this functionality has not been implemented yet" => "Sajnáljuk, ez a funkció még nem támogatott",
+"Not implemented" => "Nem támogatott",
+"Couldn't get a valid address." => "Érvényes cím lekérése sikertelen",
+"Error" => "Hiba",
+"Contact" => "Kapcsolat",
+"This property has to be non-empty." => "Ezt a tulajdonságot muszáj kitölteni",
+"Couldn't serialize elements." => "Sorbarakás sikertelen",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát.",
+"Edit name" => "Név szerkesztése",
+"No files selected for upload." => "Nincs kiválasztva feltöltendő fájl",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő fájl mérete meghaladja a megengedett mértéket",
+"Select type" => "Típus kiválasztása",
+"Result: " => "Eredmény: ",
+" imported, " => "  beimportálva,  ",
+" failed." => "  sikertelen",
 "Addressbook not found." => "Címlista nem található",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Személyhívó",
 "Internet" => "Internet",
+"Birthday" => "Születésnap",
 "{name}'s Birthday" => "{name} születésnapja",
-"Contact" => "Kapcsolat",
 "Add Contact" => "Kapcsolat hozzáadása",
+"Import" => "Import",
 "Addressbooks" => "Címlisták",
+"Close" => "Bezár",
 "Configure Address Books" => "Címlisták beállítása",
 "New Address Book" => "Új címlista",
-"Import from VCF" => "Importálás VCF-ből",
 "CardDav Link" => "CardDav hivatkozás",
 "Download" => "Letöltés",
 "Edit" => "Szerkesztés",
 "Delete" => "Törlés",
-"Download contact" => "Kapcsolat letöltése",
-"Delete contact" => "Kapcsolat törlése",
 "Drop photo to upload" => "Húzza ide a feltöltendő képet",
+"Delete current photo" => "Aktuális kép törlése",
+"Edit current photo" => "Aktuális kép szerkesztése",
+"Upload new photo" => "Új kép feltöltése",
+"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
 "Nickname" => "Becenév",
 "Enter nickname" => "Becenév megadása",
-"Birthday" => "Születésnap",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Csoportok",
 "Separate groups with commas" => "Vesszővel válassza el a csoportokat",
@@ -94,24 +115,19 @@
 "Edit address details" => "Cím részleteinek szerkesztése",
 "Add notes here." => "Megjegyzések",
 "Add field" => "Mező hozzáadása",
-"Profile picture" => "Profilkép",
 "Phone" => "Telefonszám",
 "Note" => "Jegyzet",
-"Delete current photo" => "Aktuális kép törlése",
-"Edit current photo" => "Aktuális kép szerkesztése",
-"Upload new photo" => "Új kép feltöltése",
-"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
+"Download contact" => "Kapcsolat letöltése",
+"Delete contact" => "Kapcsolat törlése",
+"The temporary image has been removed from cache." => "Az ideiglenes kép el lett távolítva a gyorsítótárból",
 "Edit address" => "Cím szerkesztése",
 "Type" => "Típus",
 "PO Box" => "Postafiók",
 "Extended" => "Kiterjesztett",
-"Street" => "Utca",
 "City" => "Város",
 "Region" => "Megye",
 "Zipcode" => "Irányítószám",
 "Country" => "Ország",
-"Edit categories" => "Kategóriák szerkesztése",
-"Add" => "Hozzáad",
 "Addressbook" => "Címlista",
 "Hon. prefixes" => "Előtag",
 "Miss" => "Miss",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Válassza ki a címlistát",
 "create a new addressbook" => "Címlista létrehozása",
 "Name of new addressbook" => "Új címlista neve",
-"Import" => "Import",
 "Importing contacts" => "Kapcsolatok importálása",
-"Select address book to import to:" => "Melyik címlistába történjen az importálás:",
-"Select from HD" => "Kiválasztás merevlemezről",
 "You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
 "Add contact" => "Kapcsolat hozzáadása",
 "Configure addressbooks" => "Címlisták beállítása",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index f420b48d842b68161803036a98b99d6012f565c0..0fbe1777f5dc3f3492b50c4ce8e615a28244b400 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -2,13 +2,12 @@
 "Cannot add empty property." => "Non pote adder proprietate vacue.",
 "No address books found." => "Nulle adressario trovate",
 "No contacts found." => "Nulle contactos trovate.",
-"Error adding addressbook." => "Error durante que il addeva le adressario.",
-"Error activating addressbook." => "Error in activar adressario",
 "Error saving temporary file." => "Error durante le scriptura in le file temporari",
 "Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
+"Contact" => "Contacto",
 "Addressbook not found." => "Adressario non trovate.",
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
@@ -26,19 +25,21 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
-"Contact" => "Contacto",
+"Birthday" => "Anniversario",
 "Add Contact" => "Adder contacto",
+"Import" => "Importar",
 "Addressbooks" => "Adressarios",
 "New Address Book" => "Nove adressario",
 "CardDav Link" => "Ligamine CardDav",
 "Download" => "Discargar",
 "Edit" => "Modificar",
 "Delete" => "Deler",
-"Download contact" => "Discargar contacto",
-"Delete contact" => "Deler contacto",
+"Delete current photo" => "Deler photo currente",
+"Edit current photo" => "Modificar photo currente",
+"Upload new photo" => "Incargar nove photo",
+"Select photo from ownCloud" => "Seliger photo ex ownCloud",
 "Nickname" => "Pseudonymo",
 "Enter nickname" => "Inserer pseudonymo",
-"Birthday" => "Anniversario",
 "Groups" => "Gruppos",
 "Edit groups" => "Modificar gruppos",
 "Preferred" => "Preferite",
@@ -49,24 +50,18 @@
 "View on map" => "Vider in un carta",
 "Add notes here." => "Adder notas hic",
 "Add field" => "Adder campo",
-"Profile picture" => "Imagine de profilo",
 "Phone" => "Phono",
 "Note" => "Nota",
-"Delete current photo" => "Deler photo currente",
-"Edit current photo" => "Modificar photo currente",
-"Upload new photo" => "Incargar nove photo",
-"Select photo from ownCloud" => "Seliger photo ex ownCloud",
+"Download contact" => "Discargar contacto",
+"Delete contact" => "Deler contacto",
 "Edit address" => "Modificar adresses",
 "Type" => "Typo",
 "PO Box" => "Cassa postal",
 "Extended" => "Extendite",
-"Street" => "Strata",
 "City" => "Citate",
 "Region" => "Region",
 "Zipcode" => "Codice postal",
 "Country" => "Pais",
-"Edit categories" => "Modificar categorias",
-"Add" => "Adder",
 "Addressbook" => "Adressario",
 "Hon. prefixes" => "Prefixos honorific",
 "Miss" => "Senioretta",
@@ -87,7 +82,6 @@
 "Please choose the addressbook" => "Per favor selige le adressario",
 "create a new addressbook" => "Crear un nove adressario",
 "Name of new addressbook" => "Nomine del nove gruppo:",
-"Import" => "Importar",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
 "iOS/OS X" => "iOS/OS X"
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index d98e58f94daa8e3856a5e7f0eaaae0c1a2c29c71..014dd7a3b187d72111c693af139b38bb82ff52d4 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,31 +1,34 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
 "There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
+"element name is not set." => "要素名が設定されていません。",
+"id is not set." => "idが設定されていません。",
 "Cannot add empty property." => "項目の新規追加に失敗しました。",
 "At least one of the address fields has to be filled out." => "住所の項目のうち1つは入力して下さい。",
-"Error adding contact property." => "連絡先の追加に失敗しました。",
+"Trying to add duplicate property: " => "重複する属性を追加: ",
 "No ID provided" => "IDが提供されていません",
 "Error setting checksum." => "チェックサムの設定エラー。",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
 "No address books found." => "アドレスブックが見つかりません。",
 "No contacts found." => "連絡先が見つかりません。",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
-"Cannot add addressbook with an empty name." => "名前を空白にしたままでアドレスブックを追加することはできません。",
-"Error adding addressbook." => "アドレスブックの追加に失敗しました。",
-"Error activating addressbook." => "アドレスブックの有効化に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
 "Error saving temporary file." => "一時ファイルの保存エラー。",
 "The loading photo is not valid." => "写真の読み込みは無効です。",
-"id is not set." => "idが設定されていません。",
 "Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
 "Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Contact ID is missing." => "コンタクトIDが見つかりません。",
-"Missing contact id." => "コンタクトIDが設定されていません。",
 "No photo path was submitted." => "写真のパスが登録されていません。",
 "File doesn't exist:" => "ファイルが存在しません:",
 "Error loading image." => "画像の読み込みエラー。",
-"element name is not set." => "要素名が設定されていません。",
+"Error getting contact object." => "コンタクトオブジェクトの取得エラー。",
+"Error getting PHOTO property." => "写真属性の取得エラー。",
+"Error saving contact." => "コンタクトの保存エラー。",
+"Error resizing image" => "画像のリサイズエラー",
+"Error cropping image" => "画像の切り抜きエラー",
+"Error creating temporary image" => "一時画像の生成エラー",
+"Error finding image: " => "画像検索エラー: ",
 "checksum is not set." => "チェックサムが設定されていません。",
 "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
 "Error updating contact property." => "連絡先の更新に失敗しました。",
@@ -38,8 +41,25 @@
 "The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
 "Missing a temporary folder" => "一時保存フォルダが見つかりません",
+"Couldn't save temporary image: " => "一時的な画像の保存ができませんでした: ",
+"Couldn't load temporary image: " => "一時的な画像の読み込みができませんでした: ",
+"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
 "Contacts" => "連絡先",
-"Drop a VCF file to import contacts." => "連絡先をインポートするVCFファイルをドロップしてください。",
+"Sorry, this functionality has not been implemented yet" => "申し訳ありません。この機能はまだ実装されていません",
+"Not implemented" => "未実装",
+"Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
+"Error" => "エラー",
+"Contact" => "連絡先",
+"This property has to be non-empty." => "この属性は空にできません。",
+"Couldn't serialize elements." => "要素をシリアライズできませんでした。",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。",
+"Edit name" => "名前を編集",
+"No files selected for upload." => "アップロードするファイルが選択されていません。",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
+"Select type" => "タイプを選択",
+"Result: " => "結果: ",
+" imported, " => " をインポート、 ",
+" failed." => " は失敗しました。",
 "Addressbook not found." => "アドレスブックが見つかりませんでした。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
@@ -57,24 +77,26 @@
 "Video" => "テレビ電話",
 "Pager" => "ポケベル",
 "Internet" => "インターネット",
+"Birthday" => "誕生日",
 "{name}'s Birthday" => "{name}の誕生日",
-"Contact" => "連絡先",
 "Add Contact" => "連絡先の追加",
+"Import" => "インポート",
 "Addressbooks" => "電話帳",
+"Close" => "閉じる",
 "Configure Address Books" => "アドレスブックを設定",
 "New Address Book" => "新規電話帳",
-"Import from VCF" => "VCFからインポート",
 "CardDav Link" => "CardDAVリンク",
 "Download" => "ダウンロード",
 "Edit" => "編集",
 "Delete" => "削除",
-"Download contact" => "連絡先のダウンロード",
-"Delete contact" => "連絡先の削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
+"Delete current photo" => "現在の写真を削除",
+"Edit current photo" => "現在の写真を編集",
+"Upload new photo" => "新しい写真をアップロード",
+"Select photo from ownCloud" => "ownCloudから写真を選択",
 "Edit name details" => "名前の詳細を編集",
 "Nickname" => "ニックネーム",
 "Enter nickname" => "ニックネームを入力",
-"Birthday" => "誕生日",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -90,24 +112,19 @@
 "Edit address details" => "住所の詳細を編集",
 "Add notes here." => "ここにメモを追加。",
 "Add field" => "項目を追加",
-"Profile picture" => "プロフィール写真",
 "Phone" => "電話番号",
 "Note" => "メモ",
-"Delete current photo" => "現在の写真を削除",
-"Edit current photo" => "現在の写真を編集",
-"Upload new photo" => "新しい写真をアップロード",
-"Select photo from ownCloud" => "ownCloudから写真を選択",
+"Download contact" => "連絡先のダウンロード",
+"Delete contact" => "連絡先の削除",
+"The temporary image has been removed from cache." => "一時画像はキャッシュから削除されました。",
 "Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
 "Extended" => "番地2",
-"Street" => "番地1",
 "City" => "都市",
 "Region" => "都道府県",
 "Zipcode" => "郵便番号",
 "Country" => "国名",
-"Edit categories" => "カテゴリを編集",
-"Add" => "追加",
 "Addressbook" => "アドレスブック",
 "Miss" => "Miss",
 "Ms" => "Ms",
@@ -138,10 +155,7 @@
 "Please choose the addressbook" => "アドレスブックを選択してください",
 "create a new addressbook" => "新しいアドレスブックを作成",
 "Name of new addressbook" => "新しいアドレスブックの名前",
-"Import" => "インポート",
 "Importing contacts" => "コンタクトをインポート",
-"Select address book to import to:" => "インポートするアドレスブックを選択:",
-"Select from HD" => "HDから選択",
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index fcdc1d08c62ce1766c627e1466f03fe0f0fe93b1..aa51eea79751524da6098ba57dabd20b8ca53d1e 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -1,34 +1,65 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
 "There was an error adding the contact." => "연락처를 추가하는 중 오류가 발생하였습니다.",
+"element name is not set." => "element 이름이 설정되지 않았습니다.",
+"id is not set." => "아이디가 설정되어 있지 않습니다. ",
 "Cannot add empty property." => "빈 속성을 추가할 수 없습니다.",
 "At least one of the address fields has to be filled out." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
-"Error adding contact property." => "연락처 속성을 추가할 수 없습니다.",
+"Trying to add duplicate property: " => "중복 속성 추가 시도: ",
 "No ID provided" => "제공되는 아이디 없음",
 "Error setting checksum." => "오류 검사합계 설정",
 "No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다. ",
 "No address books found." => "주소록을 찾을 수 없습니다.",
 "No contacts found." => "연락처를 찾을 수 없습니다.",
 "Missing ID" => "아이디 분실",
-"Cannot add addressbook with an empty name." => "성명란이 비어 주소록에 추가 할 수 없습니다.",
-"Error adding addressbook." => "주소록을 추가할 수 없습니다.",
-"Error activating addressbook." => "주소록을 활성화할 수 없습니다.",
+"Error parsing VCard for ID: \"" => "아이디에 대한 VCard 분석 오류",
 "No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
 "Error reading contact photo." => "사진 읽기 오류",
 "Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
 "The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
-"id is not set." => "아이디가 설정되어 있지 않습니다. ",
 "Information about vCard is incorrect. Please reload the page." => "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
 "Error deleting contact property." => "연락처 속성을 삭제할 수 없습니다.",
 "Contact ID is missing." => "접속 아이디가 없습니다. ",
-"Missing contact id." => "접속 아이디 분실",
+"No photo path was submitted." => "사진 경로가 제출되지 않았습니다. ",
 "File doesn't exist:" => "파일이 존재하지 않습니다. ",
 "Error loading image." => "로딩 이미지 오류입니다.",
+"Error getting contact object." => "연락처 개체를 가져오는 중 오류가 발생했습니다. ",
+"Error getting PHOTO property." => "사진 속성을 가져오는 중 오류가 발생했습니다. ",
+"Error saving contact." => "연락처 저장 중 오류가 발생했습니다.",
+"Error resizing image" => "이미지 크기 조정 중 오류가 발생했습니다.",
+"Error cropping image" => "이미지를 자르던 중 오류가 발생했습니다.",
+"Error creating temporary image" => "임시 이미지를 생성 중 오류가 발생했습니다.",
+"Error finding image: " => "이미지를 찾던 중 오류가 발생했습니다:",
+"checksum is not set." => "체크섬이 설정되지 않았습니다.",
+"Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
 "Error updating contact property." => "연락처 속성을 업데이트할 수 없습니다.",
+"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
 "Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
+"Error uploading contacts to storage." => "스토리지 에러 업로드 연락처.",
+"There is no error, the file uploaded with success" => "오류없이 파일업로드 성공.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "HTML형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다.",
+"The uploaded file was only partially uploaded" => "이 업로드된 파일은 부분적으로만 업로드 되었습니다.",
 "No file was uploaded" => "파일이 업로드 되어있지 않습니다",
 "Missing a temporary folder" => "임시 폴더 분실",
+"Couldn't save temporary image: " => "임시 이미지를 저장할 수 없습니다:",
+"Couldn't load temporary image: " => "임시 이미지를 불러올 수 없습니다. ",
+"No file was uploaded. Unknown error" => "파일이 업로드 되지 않았습니다. 알 수 없는 오류.",
 "Contacts" => "연락처",
+"Sorry, this functionality has not been implemented yet" => "죄송합니다. 이 기능은 아직 구현되지 않았습니다. ",
+"Not implemented" => "구현되지 않음",
+"Couldn't get a valid address." => "유효한 주소를 얻을 수 없습니다.",
+"Error" => "오류",
+"Contact" => "연락처",
+"Couldn't serialize elements." => "요소를 직렬화 할 수 없습니다.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. ",
+"Edit name" => "이름 편집",
+"No files selected for upload." => "업로드를 위한 파일이 선택되지 않았습니다. ",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. ",
+"Select type" => "유형 선택",
+"Result: " => "결과:",
+" imported, " => "불러오기,",
+" failed." => "실패.",
 "Addressbook not found." => "주소록을 찾을 수 없습니다.",
 "This is not your addressbook." => "내 주소록이 아닙니다.",
 "Contact could not be found." => "연락처를 찾을 수 없습니다.",
@@ -46,24 +77,27 @@
 "Video" => "영상 번호",
 "Pager" => "호출기",
 "Internet" => "인터넷",
+"Birthday" => "생일",
 "{name}'s Birthday" => "{이름}의 생일",
-"Contact" => "연락처",
 "Add Contact" => "연락처 추가",
+"Import" => "입력",
 "Addressbooks" => "주소록",
+"Close" => "닫기",
 "Configure Address Books" => "주소록 구성",
 "New Address Book" => "새 주소록",
-"Import from VCF" => "VCF에서 가져오기",
 "CardDav Link" => "CardDav 링크",
 "Download" => "다운로드",
 "Edit" => "편집",
 "Delete" => "삭제",
-"Download contact" => "연락처 다운로드",
-"Delete contact" => "연락처 삭제",
 "Drop photo to upload" => "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" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "이름 세부사항을 편집합니다. ",
 "Nickname" => "별명",
 "Enter nickname" => "별명 입력",
-"Birthday" => "생일",
 "dd-mm-yyyy" => "일-월-년",
 "Groups" => "그룹",
 "Separate groups with commas" => "쉼표로 그룹 구분",
@@ -71,22 +105,63 @@
 "Preferred" => "선호함",
 "Please specify a valid email address." => "올바른 이메일 주소를 입력하세요.",
 "Enter email address" => "이메일 주소 입력",
+"Delete email address" => "이메일 주소 삭제",
+"Enter phone number" => "전화번호 입력",
+"Delete phone number" => "전화번호 삭제",
+"View on map" => "지도에서 보기",
+"Edit address details" => "상세 주소 수정",
+"Add notes here." => "여기에 노트 추가.",
+"Add field" => "파일 추가",
 "Phone" => "전화 번호",
+"Note" => "노트",
+"Download contact" => "연락처 다운로드",
+"Delete contact" => "연락처 삭제",
+"The temporary image has been removed from cache." => "임시 이미지가 캐시에서 제거 되었습니다. ",
+"Edit address" => "주소 수정",
 "Type" => "종류",
 "PO Box" => "사서함",
 "Extended" => "확장",
-"Street" => "거리",
 "City" => "도시",
 "Region" => "지역",
 "Zipcode" => "우편 번호",
 "Country" => "국가",
-"Add" => "추가",
 "Addressbook" => "주소록",
+"Hon. prefixes" => "Hon. prefixes",
+"Miss" => "Miss",
+"Ms" => "Ms",
+"Mr" => "Mr",
+"Sir" => "Sir",
+"Mrs" => "Mrs",
+"Dr" => "Dr",
+"Given name" => "Given name",
+"Additional names" => "추가 이름",
+"Family name" => "성",
+"Hon. suffixes" => "Hon. suffixes",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "새 주소록",
 "Edit Addressbook" => "주소록 편집",
 "Displayname" => "표시 이름",
 "Active" => "활성",
 "Save" => "저장",
 "Submit" => "보내기",
-"Cancel" => "취소"
+"Cancel" => "취소",
+"Import a contacts file" => "연락처 파일 입력",
+"Please choose the addressbook" => "주소록을 선택해 주세요.",
+"create a new addressbook" => "새 주소록 만들기",
+"Name of new addressbook" => "새 주소록 이름",
+"Importing contacts" => "연락처 입력",
+"You have no contacts in your addressbook." => "당신의 주소록에는 연락처가 없습니다. ",
+"Add contact" => "연락처 추가",
+"Configure addressbooks" => "주소록 구성",
+"CardDAV syncing addresses" => "CardDAV 주소 동기화",
+"more info" => "더 많은 정보",
+"Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index 361e1cb93e1f1423683a5b13b2b7cbe9d983b7d0..f4a9f7b7dc0e6c25a74ade8b2610a1acaa4b971c 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -1,5 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
+"There was an error adding the contact." => "Fehler beim bäisetzen vun engem Kontakt.",
+"id is not set." => "ID ass net gesat.",
+"Cannot add empty property." => "Ka keng eidel Proprietéit bäisetzen.",
+"Trying to add duplicate property: " => "Probéieren duebel Proprietéit bäi ze setzen:",
+"No ID provided" => "Keng ID uginn",
+"Error setting checksum." => "Fehler beim setzen vun der Checksum.",
+"No categories selected for deletion." => "Keng Kategorien fir ze läschen ausgewielt.",
+"No address books found." => "Keen Adressbuch fonnt.",
+"No contacts found." => "Keng Kontakter fonnt.",
+"Missing ID" => "ID fehlt",
+"No contact ID was submitted." => "Kontakt ID ass net mat geschéckt ginn.",
+"Error reading contact photo." => "Fehler beim liesen vun der Kontakt Photo.",
+"Error saving temporary file." => "Fehler beim späicheren vum temporäre Fichier.",
+"The loading photo is not valid." => "Déi geluede Photo ass net gülteg.",
 "Information about vCard is incorrect. Please reload the page." => "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei.",
+"Error deleting contact property." => "Fehler beim läschen vun der Kontakt Proprietéit.",
+"Contact ID is missing." => "Kontakt ID fehlt.",
+"File doesn't exist:" => "Fichier existéiert net:",
+"Error loading image." => "Fehler beim lueden vum Bild.",
+"Error updating contact property." => "Fehler beim updaten vun der Kontakt Proprietéit.",
+"Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
+"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
+"Contacts" => "Kontakter",
+"Error" => "Fehler",
+"Contact" => "Kontakt",
+"Result: " => "Resultat: ",
+" imported, " => " importéiert, ",
+"Addressbook not found." => "Adressbuch net fonnt.",
 "This is not your addressbook." => "Dat do ass net däin Adressbuch.",
 "Contact could not be found." => "Konnt den Kontakt net fannen.",
 "Address" => "Adress",
@@ -11,34 +39,59 @@
 "Mobile" => "GSM",
 "Text" => "SMS",
 "Voice" => "Voice",
+"Message" => "Message",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
-"Contact" => "Kontakt",
+"Internet" => "Internet",
+"Birthday" => "Gebuertsdag",
+"{name}'s Birthday" => "{name} säi Gebuertsdag",
 "Add Contact" => "Kontakt bäisetzen",
 "Addressbooks" => "Adressbicher ",
+"Close" => "Zoumaachen",
+"Configure Address Books" => "Adressbicher konfigureiren",
 "New Address Book" => "Neit Adressbuch",
 "CardDav Link" => "CardDav Link",
 "Download" => "Download",
 "Edit" => "Editéieren",
 "Delete" => "Läschen",
-"Delete contact" => "Kontakt läschen",
-"Birthday" => "Gebuertsdag",
+"Nickname" => "Spëtznumm",
+"Enter nickname" => "Gëff e Spëtznumm an",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Gruppen",
+"Edit groups" => "Gruppen editéieren",
+"Enter phone number" => "Telefonsnummer aginn",
+"Delete phone number" => "Telefonsnummer läschen",
+"View on map" => "Op da Kaart uweisen",
+"Edit address details" => "Adress Detailer editéieren",
 "Phone" => "Telefon",
+"Note" => "Note",
+"Download contact" => "Kontakt eroflueden",
+"Delete contact" => "Kontakt läschen",
 "Type" => "Typ",
 "PO Box" => "Postleetzuel",
 "Extended" => "Erweidert",
-"Street" => "Strooss",
 "City" => "Staat",
 "Region" => "Regioun",
 "Zipcode" => "Postleetzuel",
 "Country" => "Land",
-"Add" => "Dobäisetzen",
 "Addressbook" => "Adressbuch",
+"Mr" => "M",
+"Sir" => "Sir",
+"Mrs" => "Mme",
+"Dr" => "Dr",
+"Given name" => "Virnumm",
+"Additional names" => "Weider Nimm",
+"Family name" => "Famillje Numm",
+"Ph.D." => "Ph.D.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Neit Adressbuch",
 "Edit Addressbook" => "Adressbuch editéieren",
 "Displayname" => "Ugewisene Numm",
+"Active" => "Aktiv",
 "Save" => "Späicheren",
 "Submit" => "Fortschécken",
-"Cancel" => "Ofbriechen"
+"Cancel" => "Ofbriechen",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index 435927a247c0fbad4c6c0fbab81efb0d7d6a84e6..db931cea00e4ca29ca6cec0af84760168e720b48 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -1,10 +1,20 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
 "There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
-"Error adding addressbook." => "Klaida pridedant adresų knygą.",
-"Error activating addressbook." => "Klaida aktyvuojant adresų knygą.",
+"No contacts found." => "Kontaktų nerasta.",
+"Error reading contact photo." => "Klaida skaitant kontakto nuotrauką.",
+"The loading photo is not valid." => "Netinkama įkeliama nuotrauka.",
 "Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
+"File doesn't exist:" => "Failas neegzistuoja:",
+"Error loading image." => "Klaida įkeliant nuotrauką.",
+"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Įkeliamo failo dydis viršija upload_max_filesize nustatymą php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
+"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
+"No file was uploaded" => "Nebuvo įkeltas joks failas",
 "Contacts" => "Kontaktai",
+"Contact" => "Kontaktas",
+"Addressbook not found." => "Nerasta adresų knyga.",
 "This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
 "Contact could not be found." => "Kontaktas nerastas",
 "Address" => "Adresas",
@@ -16,29 +26,30 @@
 "Mobile" => "Mobilusis",
 "Text" => "Žinučių",
 "Voice" => "Balso",
+"Message" => "Žinutė",
 "Fax" => "Faksas",
 "Video" => "Vaizdo",
 "Pager" => "Pranešimų gaviklis",
-"Contact" => "Kontaktas",
+"Internet" => "Internetas",
+"Birthday" => "Gimtadienis",
 "Add Contact" => "Pridėti kontaktą",
 "Addressbooks" => "Adresų knygos",
+"Configure Address Books" => "Konfigūruoti adresų knygas",
 "New Address Book" => "Nauja adresų knyga",
 "CardDav Link" => "CardDAV nuoroda",
 "Download" => "Atsisiųsti",
 "Edit" => "Keisti",
 "Delete" => "Trinti",
+"Nickname" => "Slapyvardis",
+"Phone" => "Telefonas",
 "Download contact" => "Atsisųsti kontaktą",
 "Delete contact" => "Ištrinti kontaktą",
-"Birthday" => "Gimtadienis",
-"Phone" => "Telefonas",
 "Type" => "Tipas",
 "PO Box" => "Pašto dėžutė",
-"Street" => "Gatvė",
 "City" => "Miestas",
 "Region" => "Regionas",
 "Zipcode" => "Pašto indeksas",
 "Country" => "Šalis",
-"Add" => "Pridėti",
 "Addressbook" => "Adresų knyga",
 "New Addressbook" => "Nauja adresų knyga",
 "Edit Addressbook" => "Redaguoti adresų knygą",
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 2b81a5d877e9e74494f8610297c4814aba59289b..894d527515a7ade11748f4a2bc67104508e75dff 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
 "There was an error adding the contact." => "Имаше грешка при додавање на контактот.",
+"element name is not set." => "име за елементот не е поставена.",
+"id is not set." => "ид не е поставено.",
 "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." => "Грешка при додавање на вредност за контактот.",
 "No ID provided" => "Нема доставено ИД",
 "Error setting checksum." => "Грешка во поставување сума за проверка.",
 "No categories selected for deletion." => "Нема избрано категории за бришење.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Не се најдени контакти.",
 "Missing ID" => "Недостасува ИД",
 "Error parsing VCard for ID: \"" => "Грешка при парсирање VCard за ИД: \"",
-"Cannot add addressbook with an empty name." => "Неможе да се внесе адресар со празно име.",
-"Error adding addressbook." => "Грешки при додавање на адресарот.",
-"Error activating addressbook." => "Грешка при активирање на адресарот.",
 "No contact ID was submitted." => "Не беше доставено ИД за контакт.",
 "Error reading contact photo." => "Грешка во читање на контакт фотографија.",
 "Error saving temporary file." => "Грешка во снимање на привремена датотека.",
 "The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
-"id is not set." => "ид не е поставено.",
 "Information about vCard is incorrect. Please reload the page." => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава.",
 "Error deleting contact property." => "Греш при бришење на вредноста за контакт.",
 "Contact ID is missing." => "ИД за контакт недостасува.",
-"Missing contact id." => "Недостасува ид за контакт.",
 "No photo path was submitted." => "Не беше поднесена патека за фотографија.",
 "File doesn't exist:" => "Не постои датотеката:",
 "Error loading image." => "Грешка во вчитување на слика.",
-"element name is not set." => "име за елементот не е поставена.",
+"Error getting contact object." => "Грешка при преземањето на контакт објектот,",
+"Error getting PHOTO property." => "Грешка при утврдувањето на карактеристиките на фотографијата.",
+"Error saving contact." => "Грешка при снимање на контактите.",
+"Error resizing image" => "Грешка при скалирање на фотографијата",
+"Error cropping image" => "Грешка при сечење на фотографијата",
+"Error creating temporary image" => "Грешка при креирањето на привремената фотографија",
+"Error finding image: " => "Грешка при наоѓањето на фотографијата:",
 "checksum is not set." => "сумата за проверка не е поставена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:",
 "Something went FUBAR. " => "Нешто се расипа.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
 "No file was uploaded" => "Не беше подигната датотека.",
 "Missing a temporary folder" => "Недостасува привремена папка",
+"Couldn't save temporary image: " => "Не можеше да се сними привремената фотографија:",
+"Couldn't load temporary image: " => "Не можеше да се вчита привремената фотографија:",
+"No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
 "Contacts" => "Контакти",
-"Drop a VCF file to import contacts." => "Довлечкај VCF датотека да се внесат контакти.",
+"Sorry, this functionality has not been implemented yet" => "Жалам, оваа функционалност уште не е имплементирана",
+"Not implemented" => "Не е имплементирано",
+"Couldn't get a valid address." => "Не можев да добијам исправна адреса.",
+"Error" => "Грешка",
+"Contact" => "Контакт",
+"This property has to be non-empty." => "Својството не смее да биде празно.",
+"Couldn't serialize elements." => "Не може да се серијализираат елементите.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org",
+"Edit name" => "Уреди го името",
+"No files selected for upload." => "Ниту еден фајл не е избран за вчитување.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер.",
+"Select type" => "Одбери тип",
+"Result: " => "Резултат: ",
+" imported, " => "увезено,",
+" failed." => "неуспешно.",
 "Addressbook not found." => "Адресарот не е најден.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
@@ -60,25 +79,27 @@
 "Video" => "Видео",
 "Pager" => "Пејџер",
 "Internet" => "Интернет",
+"Birthday" => "Роденден",
 "{name}'s Birthday" => "Роденден на {name}",
-"Contact" => "Контакт",
 "Add Contact" => "Додади контакт",
+"Import" => "Внеси",
 "Addressbooks" => "Адресари",
+"Close" => "Затвои",
 "Configure Address Books" => "Конфигурирај адресар",
 "New Address Book" => "Нов адресар",
-"Import from VCF" => "Внеси од VCF",
 "CardDav Link" => "Врска за CardDav",
 "Download" => "Преземи",
 "Edit" => "Уреди",
 "Delete" => "Избриши",
-"Download contact" => "Преземи го контактот",
-"Delete 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" => "Уреди детали за име",
 "Nickname" => "Прекар",
 "Enter nickname" => "Внеси прекар",
-"Birthday" => "Роденден",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Групи",
 "Separate groups with commas" => "Одвоете ги групите со запирка",
@@ -94,24 +115,19 @@
 "Edit address details" => "Уреди детали за адреса",
 "Add notes here." => "Внесете забелешки тука.",
 "Add field" => "Додади поле",
-"Profile picture" => "Фотографија за профил",
 "Phone" => "Телефон",
 "Note" => "Забелешка",
-"Delete current photo" => "Избриши моментална фотографија",
-"Edit current photo" => "Уреди моментална фотографија",
-"Upload new photo" => "Подигни нова фотографија",
-"Select photo from ownCloud" => "Изберете фотографија од ownCloud",
+"Download contact" => "Преземи го контактот",
+"Delete contact" => "Избриши го контактот",
+"The temporary image has been removed from cache." => "Привремената слика е отстранета од кешот.",
 "Edit address" => "Уреди адреса",
 "Type" => "Тип",
 "PO Box" => "Поштенски фах",
 "Extended" => "Дополнително",
-"Street" => "Улица",
 "City" => "Град",
 "Region" => "Регион",
 "Zipcode" => "Поштенски код",
 "Country" => "Држава",
-"Edit categories" => "Уреди категории",
-"Add" => "Додади",
 "Addressbook" => "Адресар",
 "Hon. prefixes" => "Префикси за титула",
 "Miss" => "Г-ца",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Ве молам изберете адресар",
 "create a new addressbook" => "креирај нов адресар",
 "Name of new addressbook" => "Име на новиот адресар",
-"Import" => "Внеси",
 "Importing contacts" => "Внесување контакти",
-"Select address book to import to:" => "Изберете адресар да се внесе:",
-"Select from HD" => "Изберете од хард диск",
 "You have no contacts in your addressbook." => "Немате контакти во Вашиот адресар.",
 "Add contact" => "Додади контакт",
 "Configure addressbooks" => "Уреди адресари",
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 7d8a4c7d124b480e04a9d9bcdcd460398e9f2c67..734668e8692d30003f4d2ed0e70e8b48656ddd09 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -1,16 +1,68 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
 "There was an error adding the contact." => "Terdapat masalah menambah maklumat.",
+"element name is not set." => "nama elemen tidak ditetapkan.",
+"id is not set." => "ID tidak ditetapkan.",
 "Cannot add empty property." => "Tidak boleh menambah ruang kosong.",
 "At least one of the address fields has to be filled out." => "Sekurangnya satu ruangan alamat perlu diisikan.",
-"Error adding contact property." => "Terdapat masalah menambah maklumat.",
-"Error adding addressbook." => "Masalah menambah buku alamat.",
-"Error activating addressbook." => "Masalah mengaktifkan buku alamat.",
+"Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
+"No ID provided" => "tiada ID diberi",
+"Error setting checksum." => "Ralat menetapkan checksum.",
+"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
+"No address books found." => "Tiada buku alamat dijumpai.",
+"No contacts found." => "Tiada kenalan dijumpai.",
+"Missing ID" => "ID Hilang",
+"Error parsing VCard for ID: \"" => "Ralat VCard untuk ID: \"",
+"No contact ID was submitted." => "Tiada ID kenalan yang diberi.",
+"Error reading contact photo." => "Ralat pada foto kenalan.",
+"Error saving temporary file." => "Ralat menyimpan fail sementara",
+"The loading photo is not valid." => "Foto muatan tidak sah.",
 "Information about vCard is incorrect. Please reload the page." => "Maklumat vCard tidak tepat. Sila reload semula halaman ini.",
 "Error deleting contact property." => "Masalah memadam maklumat.",
+"Contact ID is missing." => "ID Kenalan telah hilang.",
+"No photo path was submitted." => "Tiada direktori gambar yang diberi.",
+"File doesn't exist:" => "Fail tidak wujud:",
+"Error loading image." => "Ralat pada muatan imej.",
+"Error getting contact object." => "Ralat mendapatkan objek pada kenalan.",
+"Error getting PHOTO property." => "Ralat mendapatkan maklumat gambar.",
+"Error saving contact." => "Ralat menyimpan kenalan.",
+"Error resizing image" => "Ralat mengubah saiz imej",
+"Error cropping image" => "Ralat memotong imej",
+"Error creating temporary image" => "Ralat mencipta imej sementara",
+"Error finding image: " => "Ralat mencari imej: ",
+"checksum is not set." => "checksum tidak ditetapkan.",
+"Information about vCard is incorrect. Please reload the page: " => "Maklumat tentang vCard tidak betul.",
+"Something went FUBAR. " => "Sesuatu tidak betul.",
 "Error updating contact property." => "Masalah mengemaskini maklumat.",
+"Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
 "Error updating addressbook." => "Masalah mengemaskini buku alamat.",
+"Error uploading contacts to storage." => "Ralat memuatnaik senarai kenalan.",
+"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
+"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
+"No file was uploaded" => "Tiada fail dimuatnaik",
+"Missing a temporary folder" => "Direktori sementara hilang",
+"Couldn't save temporary image: " => "Tidak boleh menyimpan imej sementara: ",
+"Couldn't load temporary image: " => "Tidak boleh membuka imej sementara: ",
+"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
 "Contacts" => "Hubungan-hubungan",
+"Sorry, this functionality has not been implemented yet" => "Maaf, fungsi ini masih belum boleh diguna lagi",
+"Not implemented" => "Tidak digunakan",
+"Couldn't get a valid address." => "Tidak boleh mendapat alamat yang sah.",
+"Error" => "Ralat",
+"Contact" => "Hubungan",
+"This property has to be non-empty." => "Nilai ini tidak boleh kosong.",
+"Couldn't serialize elements." => "Tidak boleh menggabungkan elemen.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org",
+"Edit name" => "Ubah nama",
+"No files selected for upload." => "Tiada fail dipilih untuk muatnaik.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan.",
+"Select type" => "PIlih jenis",
+"Result: " => "Hasil: ",
+" imported, " => " import, ",
+" failed." => " gagal.",
+"Addressbook not found." => "Buku alamat tidak dijumpai.",
 "This is not your addressbook." => "Ini bukan buku alamat anda.",
 "Contact could not be found." => "Hubungan tidak dapat ditemui",
 "Address" => "Alamat",
@@ -22,37 +74,97 @@
 "Mobile" => "Mudah alih",
 "Text" => "Teks",
 "Voice" => "Suara",
+"Message" => "Mesej",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Alat Kelui",
-"Contact" => "Hubungan",
+"Internet" => "Internet",
+"Birthday" => "Hari lahir",
+"{name}'s Birthday" => "Hari Lahir {name}",
 "Add Contact" => "Tambah kenalan",
+"Import" => "Import",
 "Addressbooks" => "Senarai Buku Alamat",
+"Close" => "Tutup",
+"Configure Address Books" => "Konfigurasi Buku Alamat",
 "New Address Book" => "Buku Alamat Baru",
 "CardDav Link" => "Sambungan CardDav",
 "Download" => "Muat naik",
 "Edit" => "Sunting",
 "Delete" => "Padam",
-"Download contact" => "Muat turun hubungan",
-"Delete contact" => "Padam hubungan",
-"Birthday" => "Hari lahir",
+"Drop photo to upload" => "Letak foto disini untuk muatnaik",
+"Delete current photo" => "Padam foto semasa",
+"Edit current photo" => "Ubah foto semasa",
+"Upload new photo" => "Muatnaik foto baru",
+"Select photo from ownCloud" => "Pilih foto dari ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma",
+"Edit name details" => "Ubah butiran nama",
+"Nickname" => "Nama Samaran",
+"Enter nickname" => "Masukkan nama samaran",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Kumpulan",
+"Separate groups with commas" => "Asingkan kumpulan dengan koma",
+"Edit groups" => "Ubah kumpulan",
 "Preferred" => "Pilihan",
+"Please specify a valid email address." => "Berikan alamat emel yang sah.",
+"Enter email address" => "Masukkan alamat emel",
+"Mail to address" => "Hantar ke alamat",
+"Delete email address" => "Padam alamat emel",
+"Enter phone number" => "Masukkan nombor telefon",
+"Delete phone number" => "Padam nombor telefon",
+"View on map" => "Lihat pada peta",
+"Edit address details" => "Ubah butiran alamat",
+"Add notes here." => "Letak nota disini.",
+"Add field" => "Letak ruangan",
 "Phone" => "Telefon",
+"Note" => "Nota",
+"Download contact" => "Muat turun hubungan",
+"Delete contact" => "Padam hubungan",
+"The temporary image has been removed from cache." => "Imej sementara telah dibuang dari cache.",
+"Edit address" => "Ubah alamat",
 "Type" => "Jenis",
 "PO Box" => "Peti surat",
 "Extended" => "Sambungan",
-"Street" => "Jalan",
 "City" => "bandar",
 "Region" => "Wilayah",
 "Zipcode" => "Poskod",
 "Country" => "Negara",
-"Add" => "Tambah",
 "Addressbook" => "Buku alamat",
+"Hon. prefixes" => "Awalan nama",
+"Miss" => "Cik",
+"Ms" => "Cik",
+"Mr" => "Encik",
+"Sir" => "Tuan",
+"Mrs" => "Puan",
+"Dr" => "Dr",
+"Given name" => "Nama diberi",
+"Additional names" => "Nama tambahan",
+"Family name" => "Nama keluarga",
+"Hon. suffixes" => "Awalan nama",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Buku Alamat Baru",
 "Edit Addressbook" => "Kemaskini Buku Alamat",
 "Displayname" => "Paparan nama",
 "Active" => "Aktif",
 "Save" => "Simpan",
 "Submit" => "Hantar",
-"Cancel" => "Batal"
+"Cancel" => "Batal",
+"Import a contacts file" => "Import fail kenalan",
+"Please choose the addressbook" => "Sila pilih buku alamat",
+"create a new addressbook" => "Cipta buku alamat baru",
+"Name of new addressbook" => "Nama buku alamat",
+"Importing contacts" => "Import senarai kenalan",
+"You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.",
+"Add contact" => "Letak kenalan",
+"Configure addressbooks" => "Konfigurasi buku alamat",
+"CardDAV syncing addresses" => "alamat selarian CardDAV",
+"more info" => "maklumat lanjut",
+"Primary address (Kontact et al)" => "Alamat utama",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 3f7731bede86c12da32c8d621577ed06d5f2f222..663909eeeb18007a697e6e2a408ae8157d87d011 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -1,38 +1,52 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
 "There was an error adding the contact." => "Et problem oppsto med å legge til kontakten.",
+"id is not set." => "id er ikke satt.",
 "Cannot add empty property." => "Kan ikke legge til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst en av adressefeltene må oppgis.",
-"Error adding contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
 "No contacts found." => "Ingen kontakter funnet.",
 "Missing ID" => "Manglende ID",
-"Cannot add addressbook with an empty name." => "Kan ikke legge til en adressebok uten navn.",
-"Error adding addressbook." => "Et problem oppsto med å legge til adresseboken.",
-"Error activating addressbook." => "Et problem oppsto med å aktivere adresseboken.",
 "Error reading contact photo." => "Klarte ikke å lese kontaktbilde.",
 "Error saving temporary file." => "Klarte ikke å lagre midlertidig fil.",
 "The loading photo is not valid." => "Bildet som lastes inn er ikke gyldig.",
-"id is not set." => "id er ikke satt.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
 "Error deleting contact property." => "Et problem oppsto med å fjerne kontaktfeltet.",
-"Missing contact id." => "Mangler kontakt-id.",
+"Contact ID is missing." => "Kontakt-ID mangler.",
 "No photo path was submitted." => "Ingen filsti ble lagt inn.",
 "File doesn't exist:" => "Filen eksisterer ikke:",
 "Error loading image." => "Klarte ikke å laste bilde.",
+"Error saving contact." => "Klarte ikke å lagre kontakt.",
+"Error resizing image" => "Klarte ikke å endre størrelse på bildet",
+"Error cropping image" => "Klarte ikke å beskjære bildet",
+"Error creating temporary image" => "Klarte ikke å lage et midlertidig bilde",
+"Error finding image: " => "Kunne ikke finne bilde:",
 "Something went FUBAR. " => "Noe gikk fryktelig galt.",
 "Error updating contact property." => "Et problem oppsto med å legge til kontaktfeltet.",
 "Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
 "Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
+"Error uploading contacts to storage." => "Klarte ikke å laste opp kontakter til lagringsplassen",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
 "The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
 "No file was uploaded" => "Ingen filer ble lastet opp",
 "Missing a temporary folder" => "Mangler midlertidig mappe",
+"Couldn't save temporary image: " => "Kunne ikke lagre midlertidig bilde:",
+"Couldn't load temporary image: " => "Kunne ikke laste midlertidig bilde:",
+"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "Contacts" => "Kontakter",
+"Error" => "Feil",
+"Contact" => "Kontakt",
+"Edit name" => "Endre navn",
+"No files selected for upload." => "Ingen filer valgt for opplasting.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du prøver å laste opp er for stor.",
+"Select type" => "Velg type",
+"Result: " => "Resultat:",
+" imported, " => "importert,",
+" failed." => "feilet.",
 "Addressbook not found." => "Adresseboken ble ikke funnet.",
 "This is not your addressbook." => "Dette er ikke dine adressebok.",
 "Contact could not be found." => "Kontakten ble ikke funnet.",
@@ -50,24 +64,26 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internett",
-"{name}'s Birthday" => "bursdagen til {name}",
-"Contact" => "Kontakt",
+"Birthday" => "Bursdag",
+"{name}'s Birthday" => "{name}s bursdag",
 "Add Contact" => "Ny kontakt",
+"Import" => "Importer",
 "Addressbooks" => "Adressebøker",
+"Close" => "Lukk",
 "Configure Address Books" => "Konfigurer adressebok",
 "New Address Book" => "Ny adressebok",
-"Import from VCF" => "Importer fra VDF",
 "CardDav Link" => "CardDAV-lenke",
 "Download" => "Hent ned",
 "Edit" => "Rediger",
 "Delete" => "Slett",
-"Download contact" => "Hend ned kontakten",
-"Delete contact" => "Slett kontakt",
 "Drop photo to upload" => "Dra bilder hit for å laste opp",
+"Delete current photo" => "Fjern nåværende bilde",
+"Edit current photo" => "Rediger nåværende bilde",
+"Upload new photo" => "Last opp nytt bilde",
+"Select photo from ownCloud" => "Velg bilde fra ownCloud",
 "Edit name details" => "Endre detaljer rundt navn",
 "Nickname" => "Kallenavn",
 "Enter nickname" => "Skriv inn kallenavn",
-"Birthday" => "Bursdag",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Skill gruppene med komma",
@@ -83,25 +99,21 @@
 "Edit address details" => "Endre detaljer rundt adresse",
 "Add notes here." => "Legg inn notater her.",
 "Add field" => "Legg til felt",
-"Profile picture" => "Profilbilde",
 "Phone" => "Telefon",
 "Note" => "Notat",
-"Delete current photo" => "Fjern nåværende bilde",
-"Edit current photo" => "Rediger nåværende bilde",
-"Upload new photo" => "Last opp nytt bilde",
-"Select photo from ownCloud" => "Velg bilde fra ownCloud",
+"Download contact" => "Hend ned kontakten",
+"Delete contact" => "Slett kontakt",
+"The temporary image has been removed from cache." => "Det midlertidige bildet er fjernet fra cache.",
 "Edit address" => "Endre adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Utvidet",
-"Street" => "Gate",
 "City" => "By",
 "Region" => "Området",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Edit categories" => "Endre kategorier",
-"Add" => "Ny",
 "Addressbook" => "Adressebok",
+"Hon. prefixes" => "Ærestitler",
 "Miss" => "Frøken",
 "Mr" => "Herr",
 "Mrs" => "Fru",
@@ -124,7 +136,6 @@
 "Please choose the addressbook" => "Vennligst velg adressebok",
 "create a new addressbook" => "Lag ny adressebok",
 "Name of new addressbook" => "Navn på ny adressebok",
-"Import" => "Importer",
 "Importing contacts" => "Importerer kontakter",
 "You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
 "Add contact" => "Ny kontakt",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index fd7e50ba4d58b6a1f06f6a403cb307c4880edc9b..eccd757c240ff43e41ba48c47e0ab340b48e54eb 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
 "There was an error adding the contact." => "Er was een fout bij het toevoegen van het contact.",
+"element name is not set." => "onderdeel naam is niet opgegeven.",
+"id is not set." => "id is niet ingesteld.",
 "Cannot add empty property." => "Kan geen lege eigenschap toevoegen.",
 "At least one of the address fields has to be filled out." => "Minstens één van de adresvelden moet ingevuld worden.",
 "Trying to add duplicate property: " => "Eigenschap bestaat al: ",
-"Error adding contact property." => "Fout bij het toevoegen van de contacteigenschap.",
 "No ID provided" => "Geen ID opgegeven",
 "Error setting checksum." => "Instellen controlegetal mislukt",
 "No categories selected for deletion." => "Geen categorieën geselecteerd om te verwijderen.",
@@ -12,22 +13,16 @@
 "No contacts found." => "Geen contracten gevonden",
 "Missing ID" => "Ontbrekend ID",
 "Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
-"Cannot add addressbook with an empty name." => "Kan geen adresboek toevoegen zonder naam.",
-"Error adding addressbook." => "Fout bij het toevoegen van het adresboek.",
-"Error activating addressbook." => "Fout bij het activeren van het adresboek.",
 "No contact ID was submitted." => "Geen contact ID opgestuurd.",
 "Error reading contact photo." => "Lezen van contact foto mislukt.",
 "Error saving temporary file." => "Tijdelijk bestand opslaan mislukt.",
 "The loading photo is not valid." => "De geladen foto is niet goed.",
-"id is not set." => "id is niet ingesteld.",
 "Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
 "Error deleting contact property." => "Fout bij het verwijderen van de contacteigenschap.",
 "Contact ID is missing." => "Contact ID ontbreekt.",
-"Missing contact id." => "Ontbrekende contact id.",
 "No photo path was submitted." => "Geen fotopad opgestuurd.",
 "File doesn't exist:" => "Bestand bestaat niet:",
 "Error loading image." => "Fout bij laden plaatje.",
-"element name is not set." => "onderdeel naam is niet opgegeven.",
 "checksum is not set." => "controlegetal is niet opgegeven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informatie over vCard is fout. Herlaad de pagina: ",
 "Something went FUBAR. " => "Er ging iets totaal verkeerd. ",
@@ -42,7 +37,7 @@
 "No file was uploaded" => "Er is geen bestand geüpload",
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
-"Drop a VCF file to import contacts." => "Sleep een VCF bestand om de contacten te importeren.",
+"Contact" => "Contact",
 "Addressbook not found." => "Adresboek niet gevonden.",
 "This is not your addressbook." => "Dit is niet uw adresboek.",
 "Contact could not be found." => "Contact kon niet worden gevonden.",
@@ -60,25 +55,26 @@
 "Video" => "Video",
 "Pager" => "Pieper",
 "Internet" => "Internet",
+"Birthday" => "Verjaardag",
 "{name}'s Birthday" => "{name}'s verjaardag",
-"Contact" => "Contact",
 "Add Contact" => "Contact toevoegen",
+"Import" => "Importeer",
 "Addressbooks" => "Adresboeken",
 "Configure Address Books" => "Instellen adresboeken",
 "New Address Book" => "Nieuw Adresboek",
-"Import from VCF" => "Importeer uit VCF",
 "CardDav Link" => "CardDav Link",
 "Download" => "Download",
 "Edit" => "Bewerken",
 "Delete" => "Verwijderen",
-"Download contact" => "Download contact",
-"Delete contact" => "Verwijder contact",
 "Drop photo to upload" => "Verwijder foto uit upload",
+"Delete current photo" => "Verwijdere huidige foto",
+"Edit current photo" => "Wijzig huidige foto",
+"Upload new photo" => "Upload nieuwe foto",
+"Select photo from ownCloud" => "Selecteer foto uit ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma",
 "Edit name details" => "Wijzig naam gegevens",
 "Nickname" => "Roepnaam",
 "Enter nickname" => "Voer roepnaam in",
-"Birthday" => "Verjaardag",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Groepen",
 "Separate groups with commas" => "Gebruik komma bij meerder groepen",
@@ -94,24 +90,18 @@
 "Edit address details" => "Wijzig adres gegevens",
 "Add notes here." => "Voeg notitie toe",
 "Add field" => "Voeg veld toe",
-"Profile picture" => "Profiel foto",
 "Phone" => "Telefoon",
 "Note" => "Notitie",
-"Delete current photo" => "Verwijdere huidige foto",
-"Edit current photo" => "Wijzig huidige foto",
-"Upload new photo" => "Upload nieuwe foto",
-"Select photo from ownCloud" => "Selecteer foto uit ownCloud",
+"Download contact" => "Download contact",
+"Delete contact" => "Verwijder contact",
 "Edit address" => "Wijzig adres",
 "Type" => "Type",
 "PO Box" => "Postbus",
 "Extended" => "Uitgebreide",
-"Street" => "Straat",
 "City" => "Stad",
 "Region" => "Regio",
 "Zipcode" => "Postcode",
 "Country" => "Land",
-"Edit categories" => "Wijzig categorieën",
-"Add" => "Voeg toe",
 "Addressbook" => "Adresboek",
 "Hon. prefixes" => "Hon. prefixes",
 "Given name" => "Voornaam",
@@ -128,10 +118,7 @@
 "Please choose the addressbook" => "Kies een adresboek",
 "create a new addressbook" => "Maak een nieuw adresboek",
 "Name of new addressbook" => "Naam van nieuw adresboek",
-"Import" => "Importeer",
 "Importing contacts" => "Importeren van contacten",
-"Select address book to import to:" => "Selecteer adresboek voor import:",
-"Select from HD" => "Selecteer van schijf",
 "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
 "Add contact" => "Contactpersoon toevoegen",
 "Configure addressbooks" => "Bewerken adresboeken",
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 5b3fc5b1ab3fc71e6e571d12f42365de7c4a4fba..53f863ce81ad51ca6017ab15bfffa78b10843982 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -3,14 +3,12 @@
 "There was an error adding the contact." => "Det kom ei feilmelding då kontakta vart lagt til.",
 "Cannot add empty property." => "Kan ikkje leggja til tomt felt.",
 "At least one of the address fields has to be filled out." => "Minst eit av adressefelta må fyllast ut.",
-"Error adding contact property." => "Eit problem oppstod ved å leggja til kontakteltet.",
-"Error adding addressbook." => "Eit problem oppstod ved å leggja til adresseboka.",
-"Error activating addressbook." => "Eit problem oppstod ved aktivering av adresseboka.",
 "Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
 "Error deleting contact property." => "Eit problem oppstod ved å slette kontaktfeltet.",
 "Error updating contact property." => "Eit problem oppstod ved å endre kontaktfeltet.",
 "Error updating addressbook." => "Eit problem oppstod ved å oppdatere adresseboka.",
 "Contacts" => "Kotaktar",
+"Contact" => "Kontakt",
 "This is not your addressbook." => "Dette er ikkje di adressebok.",
 "Contact could not be found." => "Fann ikkje kontakten.",
 "Address" => "Adresse",
@@ -25,7 +23,7 @@
 "Fax" => "Faks",
 "Video" => "Video",
 "Pager" => "Personsøkjar",
-"Contact" => "Kontakt",
+"Birthday" => "Bursdag",
 "Add Contact" => "Legg til kontakt",
 "Addressbooks" => "Adressebøker",
 "New Address Book" => "Ny adressebok",
@@ -33,20 +31,17 @@
 "Download" => "Last ned",
 "Edit" => "Endra",
 "Delete" => "Slett",
-"Download contact" => "Last ned kontakt",
-"Delete contact" => "Slett kontakt",
-"Birthday" => "Bursdag",
 "Preferred" => "Føretrekt",
 "Phone" => "Telefonnummer",
+"Download contact" => "Last ned kontakt",
+"Delete contact" => "Slett kontakt",
 "Type" => "Skriv",
 "PO Box" => "Postboks",
 "Extended" => "Utvida",
-"Street" => "Gate",
 "City" => "Stad",
 "Region" => "Region/fylke",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Add" => "Legg til",
 "Addressbook" => "Adressebok",
 "New Addressbook" => "Ny adressebok",
 "Edit Addressbook" => "Endre adressebok",
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index a99f1906958b69cfc819fc0aba009937cb8c97ee..8e5fe3b44e5cbc130b8a0e8b84181e3693a74627 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
 "There was an error adding the contact." => "Wystąpił błąd podczas dodawania kontaktu.",
+"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"id is not set." => "id nie ustawione.",
 "Cannot add empty property." => "Nie można dodać pustego elementu.",
 "At least one of the address fields has to be filled out." => "Należy wypełnić przynajmniej jedno pole adresu.",
 "Trying to add duplicate property: " => "Próba dodania z duplikowanej właściwości:",
-"Error adding contact property." => "Błąd dodawania elementu.",
 "No ID provided" => "Brak opatrzonego ID ",
 "Error setting checksum." => "Błąd ustawień sumy kontrolnej",
 "No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nie znaleziono kontaktów.",
 "Missing ID" => "Brak ID",
 "Error parsing VCard for ID: \"" => "Wystąpił błąd podczas przetwarzania VCard ID: \"",
-"Cannot add addressbook with an empty name." => "Nie można dodać książki adresowej z pusta nazwą",
-"Error adding addressbook." => "Błąd dodawania książki adresowej.",
-"Error activating addressbook." => "Błąd aktywowania książki adresowej.",
 "No contact ID was submitted." => "ID kontaktu nie został utworzony.",
 "Error reading contact photo." => "Błąd odczytu zdjęcia kontaktu.",
 "Error saving temporary file." => "Wystąpił błąd podczas zapisywania pliku tymczasowego.",
 "The loading photo is not valid." => "Wczytywane zdjęcie nie jest poprawne.",
-"id is not set." => "id nie ustawione.",
 "Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
 "Error deleting contact property." => "Błąd usuwania elementu.",
 "Contact ID is missing." => "Brak kontaktu id.",
-"Missing contact id." => "Brak kontaktu id.",
 "No photo path was submitted." => "Ścieżka do zdjęcia nie została podana.",
 "File doesn't exist:" => "Plik nie istnieje:",
 "Error loading image." => "Błąd ładowania obrazu.",
-"element name is not set." => "nazwa elementu nie jest ustawiona.",
+"Error getting contact object." => "Błąd pobrania kontaktu.",
+"Error getting PHOTO property." => "Błąd uzyskiwania właściwości ZDJĘCIA.",
+"Error saving contact." => "Błąd zapisu kontaktu.",
+"Error resizing image" => "Błąd zmiany rozmiaru obrazu",
+"Error cropping image" => "Błąd przycinania obrazu",
+"Error creating temporary image" => "Błąd utworzenia obrazu tymczasowego",
+"Error finding image: " => "Błąd znajdowanie obrazu: ",
 "checksum is not set." => "checksum-a nie ustawiona",
 "Information about vCard is incorrect. Please reload the page: " => "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:",
 "Something went FUBAR. " => "Gdyby coś poszło FUBAR.",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "Załadowany plik tylko częściowo został wysłany.",
 "No file was uploaded" => "Plik nie został załadowany",
 "Missing a temporary folder" => "Brak folderu tymczasowego",
+"Couldn't save temporary image: " => "Nie można zapisać obrazu tymczasowego: ",
+"Couldn't load temporary image: " => "Nie można wczytać obrazu tymczasowego: ",
+"No file was uploaded. Unknown error" => "Plik nie został załadowany. Nieznany błąd",
 "Contacts" => "Kontakty",
-"Drop a VCF file to import contacts." => "Upuść plik VCF do importu kontaktów.",
+"Sorry, this functionality has not been implemented yet" => "Niestety, ta funkcja nie została jeszcze zaimplementowana",
+"Not implemented" => "Nie wdrożono",
+"Couldn't get a valid address." => "Nie można pobrać prawidłowego adresu.",
+"Error" => "Błąd",
+"Contact" => "Kontakt",
+"This property has to be non-empty." => "Ta właściwość nie może być pusta.",
+"Couldn't serialize elements." => "Nie można serializować elementów.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org",
+"Edit name" => "Zmień nazwę",
+"No files selected for upload." => "Żadne pliki nie zostały zaznaczone do wysłania.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze.",
+"Select type" => "Wybierz typ",
+"Result: " => "Wynik: ",
+" imported, " => " importowane, ",
+" failed." => "  nie powiodło się.",
 "Addressbook not found." => "Nie znaleziono książki adresowej",
 "This is not your addressbook." => "To nie jest Twoja książka adresowa.",
 "Contact could not be found." => "Nie można odnaleźć kontaktu.",
@@ -60,25 +79,27 @@
 "Video" => "Połączenie wideo",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Urodziny",
 "{name}'s Birthday" => "{name} Urodzony",
-"Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
+"Import" => "Import",
 "Addressbooks" => "Książki adresowe",
+"Close" => "Zamknij",
 "Configure Address Books" => "Konfiguruj książkę adresową",
 "New Address Book" => "Nowa książka adresowa",
-"Import from VCF" => "Importuj z VFC",
 "CardDav Link" => "Wyświetla odnośnik CardDav",
 "Download" => "Pobiera książkę adresową",
 "Edit" => "Edytuje książkę adresową",
 "Delete" => "Usuwa książkę adresową",
-"Download contact" => "Pobiera kontakt",
-"Delete contact" => "Usuwa kontakt",
 "Drop photo to upload" => "Upuść fotografię aby załadować",
+"Delete current photo" => "Usuń aktualne zdjęcie",
+"Edit current photo" => "Edytuj aktualne zdjęcie",
+"Upload new photo" => "Wczytaj nowe zdjęcie",
+"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem",
 "Edit name details" => "Edytuj szczegóły nazwy",
 "Nickname" => "Nazwa",
 "Enter nickname" => "Wpisz nazwę",
-"Birthday" => "Urodziny",
 "dd-mm-yyyy" => "dd-mm-rrrr",
 "Groups" => "Grupy",
 "Separate groups with commas" => "Oddziel grupy przecinkami",
@@ -94,24 +115,19 @@
 "Edit address details" => "Edytuj szczegóły adresu",
 "Add notes here." => "Dodaj notatkę tutaj.",
 "Add field" => "Dodaj pole",
-"Profile picture" => "Zdjęcie profilu",
 "Phone" => "Telefon",
 "Note" => "Uwaga",
-"Delete current photo" => "Usuń aktualne zdjęcie",
-"Edit current photo" => "Edytuj aktualne zdjęcie",
-"Upload new photo" => "Wczytaj nowe zdjęcie",
-"Select photo from ownCloud" => "Wybierz zdjęcie z ownCloud",
+"Download contact" => "Pobiera kontakt",
+"Delete contact" => "Usuwa kontakt",
+"The temporary image has been removed from cache." => "Tymczasowy obraz został usunięty z pamięci podręcznej.",
 "Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
 "Extended" => "Rozszerzony",
-"Street" => "Ulica",
 "City" => "Miasto",
 "Region" => "Region",
 "Zipcode" => "Kod pocztowy",
 "Country" => "Kraj",
-"Edit categories" => "Edytuj kategorie",
-"Add" => "Dodaj",
 "Addressbook" => "Książka adresowa",
 "Hon. prefixes" => "Prefiksy Hon.",
 "Miss" => "Panna",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Proszę wybrać książkę adresową",
 "create a new addressbook" => "utwórz nową książkę adresową",
 "Name of new addressbook" => "Nazwa nowej książki adresowej",
-"Import" => "Import",
 "Importing contacts" => "importuj kontakty",
-"Select address book to import to:" => "Zaznacz książkę adresową do importu do:",
-"Select from HD" => "Wybierz z HD",
 "You have no contacts in your addressbook." => "Nie masz żadnych kontaktów w swojej książce adresowej.",
 "Add contact" => "Dodaj kontakt",
 "Configure addressbooks" => "Konfiguruj książkę adresową",
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index e0da0a771a5cc18be491bd94651f1168ed719d3f..45ae8206df17225b8605b63e0d532466dcfc4782 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Erro ao (des)ativar agenda.",
 "There was an error adding the contact." => "Ocorreu um erro ao adicionar o contato.",
+"element name is not set." => "nome do elemento não definido.",
+"id is not set." => "ID não definido.",
 "Cannot add empty property." => "Não é possível adicionar propriedade vazia.",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço tem que ser preenchido.",
 "Trying to add duplicate property: " => "Tentando adiciona propriedade duplicada:",
-"Error adding contact property." => "Erro ao adicionar propriedade de contato.",
 "No ID provided" => "Nenhum ID fornecido",
 "Error setting checksum." => "Erro ajustando checksum.",
 "No categories selected for deletion." => "Nenhum categoria selecionada para remoção.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nenhum contato encontrado.",
 "Missing ID" => "Faltando ID",
 "Error parsing VCard for ID: \"" => "Erro de identificação VCard para ID:",
-"Cannot add addressbook with an empty name." => "Não é possivel adicionar uma agenda de endereços com o nome em branco.",
-"Error adding addressbook." => "Erro ao adicionar agenda.",
-"Error activating addressbook." => "Erro ao ativar agenda.",
 "No contact ID was submitted." => "Nenhum ID do contato foi submetido.",
 "Error reading contact photo." => "Erro de leitura na foto do contato.",
 "Error saving temporary file." => "Erro ao salvar arquivo temporário.",
 "The loading photo is not valid." => "Foto carregada não é válida.",
-"id is not set." => "ID não definido.",
 "Information about vCard is incorrect. Please reload the page." => "Informações sobre vCard é incorreta. Por favor, recarregue a página.",
 "Error deleting contact property." => "Erro ao excluir propriedade de contato.",
 "Contact ID is missing." => "ID do contato está faltando.",
-"Missing contact id." => "Faltando ID do contato.",
 "No photo path was submitted." => "Nenhum caminho para foto foi submetido.",
 "File doesn't exist:" => "Arquivo não existe:",
 "Error loading image." => "Erro ao carregar imagem.",
-"element name is not set." => "nome do elemento não definido.",
+"Error getting contact object." => "Erro ao obter propriedade de contato.",
+"Error getting PHOTO property." => "Erro ao obter propriedade da FOTO.",
+"Error saving contact." => "Erro ao salvar contato.",
+"Error resizing image" => "Erro ao modificar tamanho da imagem",
+"Error cropping image" => "Erro ao recortar imagem",
+"Error creating temporary image" => "Erro ao criar imagem temporária",
+"Error finding image: " => "Erro ao localizar imagem:",
 "checksum is not set." => "checksum não definido.",
 "Information about vCard is incorrect. Please reload the page: " => "Informação sobre vCard incorreto. Por favor, recarregue a página:",
 "Something went FUBAR. " => "Something went FUBAR. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "O arquivo foi parcialmente carregado",
 "No file was uploaded" => "Nenhum arquivo carregado",
 "Missing a temporary folder" => "Diretório temporário não encontrado",
+"Couldn't save temporary image: " => "Não foi possível salvar a imagem temporária:",
+"Couldn't load temporary image: " => "Não foi possível carregar a imagem temporária:",
+"No file was uploaded. Unknown error" => "Nenhum arquivo foi transferido. Erro desconhecido",
 "Contacts" => "Contatos",
-"Drop a VCF file to import contacts." => "Arraste um arquivo VCF para importar contatos.",
+"Sorry, this functionality has not been implemented yet" => "Desculpe, esta funcionalidade não foi implementada ainda",
+"Not implemented" => "não implementado",
+"Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
+"Error" => "Erro",
+"Contact" => "Contato",
+"This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
+"Couldn't serialize elements." => "Não foi possível serializar elementos.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Nenhum arquivo selecionado para carregar.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor.",
+"Select type" => "Selecione o tipo",
+"Result: " => "Resultado:",
+" imported, " => "importado,",
+" failed." => "falhou.",
 "Addressbook not found." => "Lista de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua agenda de endereços.",
 "Contact could not be found." => "Contato não pôde ser encontrado.",
@@ -60,25 +79,27 @@
 "Video" => "Vídeo",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Aniversário",
 "{name}'s Birthday" => "Aniversário de {name}",
-"Contact" => "Contato",
 "Add Contact" => "Adicionar Contato",
+"Import" => "Importar",
 "Addressbooks" => "Agendas de Endereço",
+"Close" => "Fechar.",
 "Configure Address Books" => "Configurar Livro de Endereços",
 "New Address Book" => "Nova agenda",
-"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Link CardDav",
 "Download" => "Baixar",
 "Edit" => "Editar",
 "Delete" => "Excluir",
-"Download contact" => "Baixar contato",
-"Delete contact" => "Apagar contato",
 "Drop photo to upload" => "Arraste a foto para ser carregada",
+"Delete current photo" => "Deletar imagem atual",
+"Edit current photo" => "Editar imagem atual",
+"Upload new photo" => "Carregar nova foto",
+"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula",
 "Edit name details" => "Editar detalhes do nome",
 "Nickname" => "Apelido",
 "Enter nickname" => "Digite o apelido",
-"Birthday" => "Aniversário",
 "dd-mm-yyyy" => "dd-mm-aaaa",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separe grupos por virgula",
@@ -94,24 +115,19 @@
 "Edit address details" => "Editar detalhes de endereço",
 "Add notes here." => "Adicionar notas",
 "Add field" => "Adicionar campo",
-"Profile picture" => "Imagem do Perfil",
 "Phone" => "Telefone",
 "Note" => "Nota",
-"Delete current photo" => "Deletar imagem atual",
-"Edit current photo" => "Editar imagem atual",
-"Upload new photo" => "Carregar nova foto",
-"Select photo from ownCloud" => "Selecionar foto do OwnCloud",
+"Download contact" => "Baixar contato",
+"Delete contact" => "Apagar contato",
+"The temporary image has been removed from cache." => "A imagem temporária foi removida cache.",
 "Edit address" => "Editar endereço",
 "Type" => "Digite",
 "PO Box" => "Caixa Postal",
 "Extended" => "Estendido",
-"Street" => "Rua",
 "City" => "Cidade",
 "Region" => "Região",
 "Zipcode" => "CEP",
 "Country" => "País",
-"Edit categories" => "Editar categorias",
-"Add" => "Adicionar",
 "Addressbook" => "Agenda de Endereço",
 "Hon. prefixes" => "Exmo. Prefixos ",
 "Miss" => "Senhorita",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "Por favor, selecione uma agenda de endereços",
 "create a new addressbook" => "Criar nova agenda de endereços",
 "Name of new addressbook" => "Nome da nova agenda de endereços",
-"Import" => "Importar",
 "Importing contacts" => "Importar contatos",
-"Select address book to import to:" => "Selecione agenda de endereços para importar ao destino:",
-"Select from HD" => "Selecione do disco rigído",
 "You have no contacts in your addressbook." => "Voce não tem contatos em sua agenda de endereços.",
 "Add contact" => "Adicionar contatos",
 "Configure addressbooks" => "Configurar agenda de endereços",
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 7a4861abf9d29d5e755fb55275a478cc684b70c7..380320216c7b6b0a6b4a0b87f82ce09c59dddda4 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
 "There was an error adding the contact." => "Erro ao adicionar contato",
+"element name is not set." => "o nome do elemento não está definido.",
+"id is not set." => "id não está definido",
 "Cannot add empty property." => "Não é possivel adicionar uma propriedade vazia",
 "At least one of the address fields has to be filled out." => "Pelo menos um dos campos de endereço precisa de estar preenchido",
 "Trying to add duplicate property: " => "A tentar adicionar propriedade duplicada: ",
-"Error adding contact property." => "Erro ao adicionar propriedade do contato",
 "No ID provided" => "Nenhum ID inserido",
 "Error setting checksum." => "Erro a definir checksum.",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Nenhum contacto encontrado.",
 "Missing ID" => "Falta ID",
 "Error parsing VCard for ID: \"" => "Erro a analisar VCard para o ID: \"",
-"Cannot add addressbook with an empty name." => "Não é possivel adicionar Livro de endereços com nome vazio.",
-"Error adding addressbook." => "Erro ao adicionar livro de endereços",
-"Error activating addressbook." => "Erro ao ativar livro de endereços",
 "No contact ID was submitted." => "Nenhum ID de contacto definido.",
 "Error reading contact photo." => "Erro a ler a foto do contacto.",
 "Error saving temporary file." => "Erro a guardar ficheiro temporário.",
 "The loading photo is not valid." => "A foto carregada não é valida.",
-"id is not set." => "id não está definido",
 "Information about vCard is incorrect. Please reload the page." => "A informação sobre o vCard está incorreta. Por favor refresque a página",
 "Error deleting contact property." => "Erro ao apagar propriedade do contato",
 "Contact ID is missing." => "Falta o ID do contacto.",
-"Missing contact id." => "Falta o ID do contacto.",
 "No photo path was submitted." => "Nenhum caminho da foto definido.",
 "File doesn't exist:" => "O ficheiro não existe:",
 "Error loading image." => "Erro a carregar a imagem.",
-"element name is not set." => "o nome do elemento não está definido.",
+"Error getting contact object." => "Erro a obter o objecto dos contactos",
+"Error getting PHOTO property." => "Erro a obter a propriedade Foto",
+"Error saving contact." => "Erro a guardar o contacto.",
+"Error resizing image" => "Erro a redimensionar a imagem",
+"Error cropping image" => "Erro a recorar a imagem",
+"Error creating temporary image" => "Erro a criar a imagem temporária",
+"Error finding image: " => "Erro enquanto pesquisava pela imagem: ",
 "checksum is not set." => "Checksum não está definido.",
 "Information about vCard is incorrect. Please reload the page: " => "A informação sobre o VCard está incorrecta. Por favor refresque a página: ",
 "Something went FUBAR. " => "Algo provocou um FUBAR. ",
@@ -36,8 +38,30 @@
 "Error updating addressbook." => "Erro a atualizar o livro de endereços",
 "Error uploading contacts to storage." => "Erro a carregar os contactos para o armazenamento.",
 "There is no error, the file uploaded with success" => "Não ocorreu erros, o ficheiro foi submetido com sucesso",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
 "No file was uploaded" => "Nenhum ficheiro foi submetido",
+"Missing a temporary folder" => "Está a faltar a pasta temporária",
+"Couldn't save temporary image: " => "Não foi possível guardar a imagem temporária: ",
+"Couldn't load temporary image: " => "Não é possível carregar a imagem temporária: ",
+"No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
 "Contacts" => "Contactos",
+"Sorry, this functionality has not been implemented yet" => "Desculpe, esta funcionalidade ainda não está implementada",
+"Not implemented" => "Não implementado",
+"Couldn't get a valid address." => "Não foi possível obter um endereço válido.",
+"Error" => "Erro",
+"Contact" => "Contacto",
+"This property has to be non-empty." => "Esta propriedade não pode estar vazia.",
+"Couldn't serialize elements." => "Não foi possivel serializar os elementos",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Nenhum ficheiro seleccionado para enviar.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor.",
+"Select type" => "Seleccionar tipo",
+"Result: " => "Resultado: ",
+" imported, " => " importado, ",
+" failed." => " falhou.",
 "Addressbook not found." => "Livro de endereços não encontrado.",
 "This is not your addressbook." => "Esta não é a sua lista de contactos",
 "Contact could not be found." => "O contacto não foi encontrado",
@@ -55,23 +79,27 @@
 "Video" => "Vídeo",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Aniversário",
 "{name}'s Birthday" => "Aniversário de {name}",
-"Contact" => "Contacto",
 "Add Contact" => "Adicionar Contacto",
+"Import" => "Importar",
 "Addressbooks" => "Livros de endereços",
+"Close" => "Fechar",
 "Configure Address Books" => "Configurar livros de endereços",
 "New Address Book" => "Novo livro de endereços",
-"Import from VCF" => "Importar de VCF",
 "CardDav Link" => "Endereço CardDav",
 "Download" => "Transferir",
 "Edit" => "Editar",
 "Delete" => "Apagar",
-"Download contact" => "Transferir contacto",
-"Delete contact" => "Apagar contato",
+"Drop photo to upload" => "Arraste e solte fotos para carregar",
+"Delete current photo" => "Eliminar a foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Upload new photo" => "Carregar nova foto",
+"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula",
 "Edit name details" => "Editar detalhes do nome",
 "Nickname" => "Alcunha",
 "Enter nickname" => "Introduza alcunha",
-"Birthday" => "Aniversário",
 "dd-mm-yyyy" => "dd-mm-aaaa",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separe os grupos usando virgulas",
@@ -87,30 +115,39 @@
 "Edit address details" => "Editar os detalhes do endereço",
 "Add notes here." => "Insira notas aqui.",
 "Add field" => "Adicionar campo",
-"Profile picture" => "Foto do perfil",
 "Phone" => "Telefone",
 "Note" => "Nota",
-"Delete current photo" => "Eliminar a foto actual",
-"Edit current photo" => "Editar a foto actual",
-"Select photo from ownCloud" => "Selecionar uma foto da ownCloud",
+"Download contact" => "Transferir contacto",
+"Delete contact" => "Apagar contato",
+"The temporary image has been removed from cache." => "A imagem temporária foi retirada do cache.",
 "Edit address" => "Editar endereço",
 "Type" => "Tipo",
 "PO Box" => "Apartado",
 "Extended" => "Extendido",
-"Street" => "Rua",
 "City" => "Cidade",
 "Region" => "Região",
 "Zipcode" => "Código Postal",
 "Country" => "País",
-"Edit categories" => "Editar categorias",
-"Add" => "Adicionar",
 "Addressbook" => "Livro de endereços",
+"Hon. prefixes" => "Prefixos honoráveis",
+"Miss" => "Menina",
 "Ms" => "Sra",
 "Mr" => "Sr",
 "Sir" => "Sr",
+"Mrs" => "Senhora",
 "Dr" => "Dr",
+"Given name" => "Nome introduzido",
 "Additional names" => "Nomes adicionais",
 "Family name" => "Nome de familia",
+"Hon. suffixes" => "Sufixos Honoráveis",
+"J.D." => "D.J.",
+"M.D." => "D.M.",
+"D.O." => "Dr.",
+"D.C." => "Dr.",
+"Ph.D." => "Dr.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "r.",
 "New Addressbook" => "Novo livro de endereços",
 "Edit Addressbook" => "Editar livro de endereços",
 "Displayname" => "Nome de exibição",
@@ -121,9 +158,13 @@
 "Import a contacts file" => "Importar um ficheiro de contactos",
 "Please choose the addressbook" => "Por favor seleccione o livro de endereços",
 "create a new addressbook" => "Criar um novo livro de endereços",
-"Import" => "Importar",
+"Name of new addressbook" => "Nome do novo livro de endereços",
 "Importing contacts" => "A importar os contactos",
+"You have no contacts in your addressbook." => "Não tem contactos no seu livro de endereços.",
 "Add contact" => "Adicionar contacto",
+"Configure addressbooks" => "Configurar livros de endereços",
+"CardDAV syncing addresses" => "CardDAV a sincronizar endereços",
 "more info" => "mais informação",
+"Primary address (Kontact et al)" => "Endereço primario (Kontact et al)",
 "iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 0160975671866fe84923c513a5b5f3b7134e04c1..9972d0b66af26ab649e59ea108fcb28be20e4654 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
 "There was an error adding the contact." => "O eroare a împiedicat adăugarea contactului.",
+"element name is not set." => "numele elementului nu este stabilit.",
+"id is not set." => "ID-ul nu este stabilit",
 "Cannot add empty property." => "Nu se poate adăuga un câmp gol.",
 "At least one of the address fields has to be filled out." => "Cel puțin unul din câmpurile adresei trebuie completat.",
-"Error adding contact property." => "Contactul nu a putut fi adăugat.",
 "No ID provided" => "Nici un ID nu a fost furnizat",
 "Error setting checksum." => "Eroare la stabilirea sumei de control",
 "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere",
@@ -11,26 +12,21 @@
 "No contacts found." => "Nici un contact găsit",
 "Missing ID" => "ID lipsă",
 "Error parsing VCard for ID: \"" => "Eroare la prelucrarea VCard-ului pentru ID:\"",
-"Cannot add addressbook with an empty name." => "Nu e posibil de adăugat o carte de adrese fără nume",
-"Error adding addressbook." => "Agenda nu a putut fi adăugată.",
-"Error activating addressbook." => "Eroare la activarea agendei.",
 "No contact ID was submitted." => "Nici un ID de contact nu a fost transmis",
 "Error reading contact photo." => "Eroare la citerea fotografiei de contact",
 "Error saving temporary file." => "Eroare la salvarea fișierului temporar.",
 "The loading photo is not valid." => "Fotografia care se încarcă nu este validă.",
-"id is not set." => "ID-ul nu este stabilit",
 "Information about vCard is incorrect. Please reload the page." => "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina.",
 "Error deleting contact property." => "Eroare la ștergerea proprietăților contactului.",
 "Contact ID is missing." => "ID-ul de contact lipsește.",
-"Missing contact id." => "ID de contact lipsă.",
 "No photo path was submitted." => "Nici o adresă către fotografie nu a fost transmisă",
 "File doesn't exist:" => "Fișierul nu există:",
 "Error loading image." => "Eroare la încărcarea imaginii.",
-"element name is not set." => "numele elementului nu este stabilit.",
 "checksum is not set." => "suma de control nu este stabilită.",
 "Error updating contact property." => "Eroare la actualizarea proprietăților contactului.",
 "Error updating addressbook." => "Eroare la actualizarea agendei.",
 "Contacts" => "Contacte",
+"Contact" => "Contact",
 "This is not your addressbook." => "Nu se găsește în agendă.",
 "Contact could not be found." => "Contactul nu a putut fi găsit.",
 "Address" => "Adresă",
@@ -47,8 +43,8 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Zi de naștere",
 "{name}'s Birthday" => "Ziua de naștere a {name}",
-"Contact" => "Contact",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
 "New Address Book" => "Agendă nouă",
@@ -56,12 +52,9 @@
 "Download" => "Descarcă",
 "Edit" => "Editează",
 "Delete" => "Șterge",
-"Download contact" => "Descarcă acest contact",
-"Delete contact" => "Șterge contact",
 "Edit name details" => "Introdu detalii despre nume",
 "Nickname" => "Pseudonim",
 "Enter nickname" => "Introdu pseudonim",
-"Birthday" => "Zi de naștere",
 "dd-mm-yyyy" => "zz-ll-aaaa",
 "Groups" => "Grupuri",
 "Separate groups with commas" => "Separă grupurile cu virgule",
@@ -72,15 +65,15 @@
 "Mail to address" => "Trimite mesaj la e-mail",
 "Delete email address" => "Șterge e-mail",
 "Phone" => "Telefon",
+"Download contact" => "Descarcă acest contact",
+"Delete contact" => "Șterge contact",
 "Type" => "Tip",
 "PO Box" => "CP",
 "Extended" => "Extins",
-"Street" => "Stradă",
 "City" => "Oraș",
 "Region" => "Regiune",
 "Zipcode" => "Cod poștal",
 "Country" => "Țară",
-"Add" => "Adaugă",
 "Addressbook" => "Agendă",
 "New Addressbook" => "Agendă nouă",
 "Edit Addressbook" => "Modifică agenda",
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 01a0e2642b90272bd54ab9748032a94ca633fa3a..63217baf32d05208f2d58b9706d3b9219647f89c 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,9 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
 "There was an error adding the contact." => "Произошла ошибка при добавлении контакта.",
+"element name is not set." => "имя элемента не установлено.",
+"id is not set." => "id не установлен.",
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
-"Error adding contact property." => "Ошибка добавления информации к контакту.",
+"Trying to add duplicate property: " => "При попытке добавить дубликат:",
 "No ID provided" => "ID не предоставлен",
 "Error setting checksum." => "Ошибка установки контрольной суммы.",
 "No categories selected for deletion." => "Категории для удаления не установлены.",
@@ -11,21 +13,26 @@
 "No contacts found." => "Контакты не найдены.",
 "Missing ID" => "Отсутствует ID",
 "Error parsing VCard for ID: \"" => "Ошибка обработки VCard для ID: \"",
-"Cannot add addressbook with an empty name." => "Нельзя добавить адресную книгу без имени.",
-"Error adding addressbook." => "Ошибка добавления адресной книги.",
-"Error activating addressbook." => "Ошибка активации адресной книги.",
+"No contact ID was submitted." => "Нет контакта ID",
 "Error reading contact photo." => "Ошибка чтения фотографии контакта.",
 "Error saving temporary file." => "Ошибка сохранения временного файла.",
 "The loading photo is not valid." => "Загружаемая фотография испорчена.",
-"id is not set." => "id не установлен.",
 "Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
 "Error deleting contact property." => "Ошибка удаления информации из контакта.",
 "Contact ID is missing." => "ID контакта отсутствует.",
+"No photo path was submitted." => "Нет фото по адресу.",
 "File doesn't exist:" => "Файл не существует:",
 "Error loading image." => "Ошибка загрузки картинки.",
-"element name is not set." => "имя элемента не установлено.",
+"Error getting contact object." => "Ошибка при получении контактов",
+"Error getting PHOTO property." => "Ошибка при получении ФОТО.",
+"Error saving contact." => "Ошибка при сохранении контактов.",
+"Error resizing image" => "Ошибка изменения размера изображений",
+"Error cropping image" => "Ошибка обрезки изображений",
+"Error creating temporary image" => "Ошибка создания временных изображений",
+"Error finding image: " => "Ошибка поиска изображений:",
 "checksum is not set." => "контрольная сумма не установлена.",
 "Information about vCard is incorrect. Please reload the page: " => "Информация о vCard не корректна. Перезагрузите страницу: ",
+"Something went FUBAR. " => "Что-то пошло FUBAR.",
 "Error updating contact property." => "Ошибка обновления информации контакта.",
 "Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
 "Error updating addressbook." => "Ошибка обновления адресной книги.",
@@ -36,7 +43,25 @@
 "The uploaded file was only partially uploaded" => "Файл загружен частично",
 "No file was uploaded" => "Файл не был загружен",
 "Missing a temporary folder" => "Отсутствует временная папка",
+"Couldn't save temporary image: " => "Не удалось сохранить временное изображение:",
+"Couldn't load temporary image: " => "Не удалось загрузить временное изображение:",
+"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
 "Contacts" => "Контакты",
+"Sorry, this functionality has not been implemented yet" => "К сожалению, эта функция не была реализована",
+"Not implemented" => "Не реализовано",
+"Couldn't get a valid address." => "Не удалось получить адрес.",
+"Error" => "Ошибка",
+"Contact" => "Контакт",
+"This property has to be non-empty." => "Это свойство должно быть не пустым.",
+"Couldn't serialize elements." => "Не удалось сериализовать элементы.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' called without type argument. Please report at bugs.owncloud.org",
+"Edit name" => "Изменить имя",
+"No files selected for upload." => "Нет выбранных файлов для загрузки.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере.",
+"Select type" => "Выберите тип",
+"Result: " => "Результат:",
+" imported, " => "импортировано, ",
+" failed." => "не удалось.",
 "Addressbook not found." => "Адресная книга не найдена.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
@@ -54,25 +79,30 @@
 "Video" => "Видео",
 "Pager" => "Пейджер",
 "Internet" => "Интернет",
+"Birthday" => "День рождения",
 "{name}'s Birthday" => "День рождения {name}",
-"Contact" => "Контакт",
 "Add Contact" => "Добавить Контакт",
+"Import" => "Импорт",
 "Addressbooks" => "Адресные книги",
+"Close" => "Закрыть",
 "Configure Address Books" => "Настроить Адресную книгу",
 "New Address Book" => "Новая адресная книга",
-"Import from VCF" => "Импортировать из VCF",
 "CardDav Link" => "Ссылка CardDAV",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
-"Download contact" => "Скачать контакт",
-"Delete 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" => "Изменить детали имени",
 "Nickname" => "Псевдоним",
 "Enter nickname" => "Введите псевдоним",
-"Birthday" => "День рождения",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Группы",
+"Separate groups with commas" => "Разделить группы запятыми",
 "Edit groups" => "Редактировать группы",
 "Preferred" => "Предпочитаемый",
 "Please specify a valid email address." => "Укажите действительный адрес электронной почты.",
@@ -85,28 +115,39 @@
 "Edit address details" => "Ввести детали адреса",
 "Add notes here." => "Добавьте заметки здесь.",
 "Add field" => "Добавить поле",
-"Profile picture" => "Фото профиля",
 "Phone" => "Телефон",
 "Note" => "Заметка",
-"Delete current photo" => "Удалить текущую фотографию",
-"Edit current photo" => "Редактировать текущую фотографию",
-"Upload new photo" => "Загрузить новую фотографию",
-"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
+"Download contact" => "Скачать контакт",
+"Delete contact" => "Удалить контакт",
+"The temporary image has been removed from cache." => "Временный образ был удален из кэша.",
 "Edit address" => "Редактировать адрес",
 "Type" => "Тип",
 "PO Box" => "АО",
 "Extended" => "Расширенный",
-"Street" => "Улица",
 "City" => "Город",
 "Region" => "Область",
 "Zipcode" => "Почтовый индекс",
 "Country" => "Страна",
-"Edit categories" => "Редактировать категрии",
-"Add" => "Добавить",
 "Addressbook" => "Адресная книга",
+"Hon. prefixes" => "Уважительные префиксы",
+"Miss" => "Мисс",
+"Ms" => "Г-жа",
+"Mr" => "Г-н",
+"Sir" => "Сэр",
+"Mrs" => "Г-жа",
+"Dr" => "Доктор",
 "Given name" => "Имя",
 "Additional names" => "Дополнительные имена (отчество)",
 "Family name" => "Фамилия",
+"Hon. suffixes" => "Hon. suffixes",
+"J.D." => "Уважительные суффиксы",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "New Addressbook" => "Новая адресная книга",
 "Edit Addressbook" => "Редактировать адресную книгу",
 "Displayname" => "Отображаемое имя",
@@ -118,10 +159,12 @@
 "Please choose the addressbook" => "Выберите адресную книгу",
 "create a new addressbook" => "создать новую адресную книгу",
 "Name of new addressbook" => "Имя новой адресной книги",
-"Import" => "Импорт",
 "Importing contacts" => "Импорт контактов",
-"You have no contacts in your addressbook." => "В адресной книге есть контакты.",
+"You have no contacts in your addressbook." => "В адресной книге нет контактов.",
 "Add contact" => "Добавить контакт",
 "Configure addressbooks" => "Настроить адресную книгу",
-"more info" => "дополнительная информация"
+"CardDAV syncing addresses" => "CardDAV синхронизации адресов",
+"more info" => "дополнительная информация",
+"Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
+"iOS/OS X" => "iOS/OS X"
 );
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index bfba23fabcf4a79bc7f290f451fe7ae0c2dc2569..7ff30a34f14adc5cb79f5cd05a5b90cd2acd765d 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,10 +1,11 @@
 <?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",
+"element name is not set." => "ime elementa ni nastavljeno.",
+"id is not set." => "id ni nastavljen.",
 "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.",
 "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.",
@@ -12,22 +13,23 @@
 "No contacts found." => "Ni bilo najdenih stikov.",
 "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.",
 "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.",
+"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: ",
 "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. ",
@@ -41,8 +43,25 @@
 "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.",
+"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",
+"Contact" => "Stik",
+"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.",
+"Select type" => "Izberite vrsto",
+"Result: " => "Rezultati: ",
+" imported, " => " uvoženih, ",
+" failed." => " je spodletelo.",
 "Addressbook not found." => "Imenik ni bil najden.",
 "This is not your addressbook." => "To ni vaš imenik.",
 "Contact could not be found." => "Stika ni bilo mogoče najti.",
@@ -60,25 +79,27 @@
 "Video" => "Video",
 "Pager" => "Pozivnik",
 "Internet" => "Internet",
+"Birthday" => "Rojstni dan",
 "{name}'s Birthday" => "{name} - rojstni dan",
-"Contact" => "Stik",
 "Add Contact" => "Dodaj stik",
+"Import" => "Uvozi",
 "Addressbooks" => "Imeniki",
+"Close" => "Zapri",
 "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",
 "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",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
-"Birthday" => "Rojstni dan",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupine",
 "Separate groups with commas" => "Skupine ločite z vejicami",
@@ -94,24 +115,19 @@
 "Edit address details" => "Uredi podrobnosti",
 "Add notes here." => "Opombe dodajte tukaj.",
 "Add field" => "Dodaj polje",
-"Profile picture" => "Slika profila",
 "Phone" => "Telefon",
 "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",
 "Extended" => "Razširjeno",
-"Street" => "Ulica",
 "City" => "Mesto",
 "Region" => "Regija",
 "Zipcode" => "Poštna št.",
 "Country" => "Dežela",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Addressbook" => "Imenik",
 "Hon. prefixes" => "Predpone",
 "Miss" => "gdč.",
@@ -143,10 +159,7 @@
 "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",
-"Select address book to import to:" => "Izberite imenik v katerega boste uvažali:",
-"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",
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index aad88f3603cd6adbf325a1c714f335916ff660e8..3db20c55b893133a42c2f1d214c7e02e1ac4dec1 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
 "Contacts" => "Контакти",
+"Contact" => "Контакт",
 "This is not your addressbook." => "Ово није ваш адресар.",
 "Contact could not be found." => "Контакт се не може наћи.",
 "Address" => "Адреса",
@@ -15,27 +16,24 @@
 "Fax" => "Факс",
 "Video" => "Видео",
 "Pager" => "Пејџер",
-"Contact" => "Контакт",
+"Birthday" => "Рођендан",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "Адресар",
 "New Address Book" => "Нови адресар",
 "Download" => "Преузимање",
 "Edit" => "Уреди",
 "Delete" => "Обриши",
-"Download contact" => "Преузми контакт",
-"Delete contact" => "Обриши контакт",
-"Birthday" => "Рођендан",
 "Preferred" => "Пожељан",
 "Phone" => "Телефон",
+"Download contact" => "Преузми контакт",
+"Delete contact" => "Обриши контакт",
 "Type" => "Тип",
 "PO Box" => "Поштански број",
 "Extended" => "Прошири",
-"Street" => "Улица",
 "City" => "Град",
 "Region" => "Регија",
 "Zipcode" => "Зип код",
 "Country" => "Земља",
-"Add" => "Додај",
 "Addressbook" => "Адресар",
 "New Addressbook" => "Нови адресар",
 "Edit Addressbook" => "Уреди адресар",
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index a76c1047907ef65fa0169a8d9727254152d62859..6238b2385b691c7ba6066d6370d4255d9ecb6035 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -14,14 +14,13 @@
 "Fax" => "Faks",
 "Video" => "Video",
 "Pager" => "Pejdžer",
+"Birthday" => "Rođendan",
 "Add Contact" => "Dodaj kontakt",
 "Edit" => "Uredi",
 "Delete" => "Obriši",
-"Birthday" => "Rođendan",
 "Phone" => "Telefon",
 "PO Box" => "Poštanski broj",
 "Extended" => "Proširi",
-"Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Zip kod",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index acf382c6a43a164a2e660932eb8ede8a66de2f91..d7af2ae13f9fb863a6c603a7a4058070760a9e4f 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
 "There was an error adding the contact." => "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่",
+"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"id is not set." => "ยังไม่ได้กำหนดรหัส",
 "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." => "เกิดข้อผิดพลาดในการเพิ่มรายละเอียดการติดต่อ",
 "No ID provided" => "ยังไม่ได้ใส่รหัส",
 "Error setting checksum." => "เกิดข้อผิดพลาดในการตั้งค่า checksum",
 "No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
@@ -12,22 +13,23 @@
 "No contacts found." => "ไม่พบข้อมูลการติดต่อที่ต้องการ",
 "Missing ID" => "รหัสสูญหาย",
 "Error parsing VCard for ID: \"" => "พบข้อผิดพลาดในการแยกรหัส VCard:\"",
-"Cannot add addressbook with an empty name." => "ไม่สามารถเพิ่มสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
-"Error adding addressbook." => "เกิดข้อผิดพลาดในการเพิ่มสมุดบันทึกที่อยู่ใหม่",
-"Error activating addressbook." => "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่",
 "No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
 "Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
 "Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
 "The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
-"id is not set." => "ยังไม่ได้กำหนดรหัส",
 "Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
 "Error deleting contact property." => "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ",
 "Contact ID is missing." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
-"Missing contact id." => "รหัสข้อมูลการติดต่อเกิดการสูญหาย",
 "No photo path was submitted." => "ไม่พบตำแหน่งพาธของรูปภาพ",
 "File doesn't exist:" => "ไม่มีไฟล์ดังกล่าว",
 "Error loading image." => "เกิดข้อผิดพลาดในการโหลดรูปภาพ",
-"element name is not set." => "ยังไม่ได้กำหนดชื่อ",
+"Error getting contact object." => "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ",
+"Error getting PHOTO property." => "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ",
+"Error saving contact." => "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ",
+"Error resizing image" => "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ",
+"Error cropping image" => "เกิดข้อผิดพลาดในการครอบตัดภาพ",
+"Error creating temporary image" => "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว",
+"Error finding image: " => "เกิดข้อผิดพลาดในการค้นหารูปภาพ: ",
 "checksum is not set." => "ยังไม่ได้กำหนดค่า checksum",
 "Information about vCard is incorrect. Please reload the page: " => "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: ",
 "Something went FUBAR. " => "มีบางอย่างเกิดการ FUBAR. ",
@@ -41,8 +43,25 @@
 "The uploaded file was only partially uploaded" => "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
 "No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
 "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
+"Couldn't save temporary image: " => "ไม่สามารถบันทึกรูปภาพชั่วคราวได้: ",
+"Couldn't load temporary image: " => "ไม่สามารถโหลดรูปภาพชั่วคราวได้: ",
+"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
 "Contacts" => "ข้อมูลการติดต่อ",
-"Drop a VCF file to import contacts." => "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ",
+"Sorry, this functionality has not been implemented yet" => "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ",
+"Not implemented" => "ยังไม่ได้ถูกดำเนินการ",
+"Couldn't get a valid address." => "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้",
+"Error" => "พบข้อผิดพลาด",
+"Contact" => "ข้อมูลการติดต่อ",
+"This property has to be non-empty." => "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่",
+"Couldn't serialize elements." => "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org",
+"Edit name" => "แก้ไขชื่อ",
+"No files selected for upload." => "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
+"Select type" => "เลือกชนิด",
+"Result: " => "ผลลัพธ์: ",
+" imported, " => " นำเข้าข้อมูลแล้ว, ",
+" failed." => " ล้มเหลว.",
 "Addressbook not found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
@@ -60,25 +79,27 @@
 "Video" => "วีดีโอ",
 "Pager" => "เพจเจอร์",
 "Internet" => "อินเทอร์เน็ต",
+"Birthday" => "วันเกิด",
 "{name}'s Birthday" => "วันเกิดของ {name}",
-"Contact" => "ข้อมูลการติดต่อ",
 "Add Contact" => "เพิ่มรายชื่อผู้ติดต่อใหม่",
+"Import" => "นำเข้า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
+"Close" => "ปิด",
 "Configure Address Books" => "กำหนดค่าสมุดบันทึกที่อยู่",
 "New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
-"Import from VCF" => "นำเข้าจาก VCF",
 "CardDav Link" => "ลิงค์ CardDav",
 "Download" => "ดาวน์โหลด",
 "Edit" => "แก้ไข",
 "Delete" => "ลบ",
-"Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
-"Delete 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" => "แก้ไขรายละเอียดของชื่อ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
-"Birthday" => "วันเกิด",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "กลุ่ม",
 "Separate groups with commas" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
@@ -94,24 +115,19 @@
 "Edit address details" => "แก้ไขรายละเอียดที่อยู่",
 "Add notes here." => "เพิ่มหมายเหตุกำกับไว้ที่นี่",
 "Add field" => "เพิ่มช่องรับข้อมูล",
-"Profile picture" => "รูปภาพโปรไฟล์",
 "Phone" => "โทรศัพท์",
 "Note" => "หมายเหตุ",
-"Delete current photo" => "ลบรูปภาพปัจจุบัน",
-"Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
-"Upload new photo" => "อัพโหลดรูปภาพใหม่",
-"Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
+"Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
+"Delete contact" => "ลบข้อมูลการติดต่อ",
+"The temporary image has been removed from cache." => "รูปภาพชั่วคราวดังกล่าวได้ถูกลบออกจากหน่วยความจำแคชแล้ว",
 "Edit address" => "แก้ไขที่อยู่",
 "Type" => "ประเภท",
 "PO Box" => "ตู้ ปณ.",
 "Extended" => "เพิ่ม",
-"Street" => "ถนน",
 "City" => "เมือง",
 "Region" => "ภูมิภาค",
 "Zipcode" => "รหัสไปรษณีย์",
 "Country" => "ประเทศ",
-"Edit categories" => "แก้ไขหมวดหมู่",
-"Add" => "เพิ่ม",
 "Addressbook" => "สมุดบันทึกที่อยู่",
 "Hon. prefixes" => "คำนำหน้าชื่อคนรัก",
 "Miss" => "นางสาว",
@@ -143,10 +159,7 @@
 "Please choose the addressbook" => "กรุณาเลือกสมุดบันทึกที่อยู่",
 "create a new addressbook" => "สร้างสมุดบันทึกที่อยู่ใหม่",
 "Name of new addressbook" => "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่",
-"Import" => "นำเข้า",
 "Importing contacts" => "นำเข้าข้อมูลการติดต่อ",
-"Select address book to import to:" => "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:",
-"Select from HD" => "เลือกจากฮาร์ดดิส",
 "You have no contacts in your addressbook." => "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ",
 "Add contact" => "เพิ่มชื่อผู้ติดต่อ",
 "Configure addressbooks" => "กำหนดค่าสมุดบันทึกที่อยู่",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index 65e8e34c30595146a07d56e7f00f608e18770d58..e10d36753cd395adeca58674f53450c848c90b29 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -1,10 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
 "There was an error adding the contact." => "Kişi eklenirken hata oluştu.",
+"element name is not set." => "eleman ismi atanmamış.",
+"id is not set." => "id atanmamış.",
+"Could not parse contact: " => "Kişi bilgisi ayrıştırılamadı.",
 "Cannot add empty property." => "Boş özellik eklenemiyor.",
 "At least one of the address fields has to be filled out." => "En az bir adres alanı doldurulmalı.",
 "Trying to add duplicate property: " => "Yinelenen özellik eklenmeye çalışılıyor: ",
-"Error adding contact property." => "Kişi özelliği eklenirken hata oluştu.",
+"Error adding contact property: " => "Kişi özelliği eklenirken hata oluştu.",
 "No ID provided" => "ID verilmedi",
 "Error setting checksum." => "İmza oluşturulurken hata.",
 "No categories selected for deletion." => "Silmek için bir kategori seçilmedi.",
@@ -12,22 +15,23 @@
 "No contacts found." => "Bağlantı bulunamadı.",
 "Missing ID" => "Eksik ID",
 "Error parsing VCard for ID: \"" => "ID için VCard ayrıştırılamadı:\"",
-"Cannot add addressbook with an empty name." => "Adres defterini isimsiz ekleyemezsiniz.",
-"Error adding addressbook." => "Adres defteri eklenirken hata oluştu.",
-"Error activating addressbook." => "Adres defteri etkinleştirilirken hata oluştu.",
 "No contact ID was submitted." => "Bağlantı ID'si girilmedi.",
 "Error reading contact photo." => "Bağlantı fotoğrafı okunamadı.",
 "Error saving temporary file." => "Geçici dosya kaydetme hatası.",
 "The loading photo is not valid." => "Yüklenecek fotograf geçerli değil.",
-"id is not set." => "id atanmamış.",
 "Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
 "Error deleting contact property." => "Kişi özelliği silinirken hata oluştu.",
 "Contact ID is missing." => "Bağlantı ID'si eksik.",
-"Missing contact id." => "Eksik bağlantı id'si.",
 "No photo path was submitted." => "Fotoğraf girilmedi.",
 "File doesn't exist:" => "Dosya mevcut değil:",
 "Error loading image." => "İmaj yükleme hatası.",
-"element name is not set." => "eleman ismi atanmamış.",
+"Error getting contact object." => "Bağlantı nesnesini kaydederken hata.",
+"Error getting PHOTO property." => "Resim özelleğini alırken hata oluştu.",
+"Error saving contact." => "Bağlantıyı kaydederken hata",
+"Error resizing image" => "Görüntü yeniden boyutlandırılamadı.",
+"Error cropping image" => "Görüntü kırpılamadı.",
+"Error creating temporary image" => "Geçici resim oluştururken hata oluştu",
+"Error finding image: " => "Resim ararken hata oluştu:",
 "checksum is not set." => "checksum atanmamış.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: ",
 "Something went FUBAR. " => "Bir şey FUBAR gitti.",
@@ -41,8 +45,27 @@
 "The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
 "No file was uploaded" => "Hiç dosya gönderilmedi",
 "Missing a temporary folder" => "Geçici dizin eksik",
+"Couldn't save temporary image: " => "Geçici resmi saklayamadı : ",
+"Couldn't load temporary image: " => "Geçici resmi yükleyemedi :",
+"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
 "Contacts" => "Kişiler",
-"Drop a VCF file to import contacts." => "Bağlantıları içe aktarmak için bir VCF dosyası bırakın.",
+"Sorry, this functionality has not been implemented yet" => "Üzgünüz, bu özellik henüz tamamlanmadı.",
+"Not implemented" => "Tamamlanmadı.",
+"Couldn't get a valid address." => "Geçerli bir adres alınamadı.",
+"Error" => "Hata",
+"Contact" => "Kişi",
+"New" => "Yeni",
+"New Contact" => "Yeni Kişi",
+"This property has to be non-empty." => "Bu özellik boş bırakılmamalı.",
+"Couldn't serialize elements." => "Öğeler seri hale getiremedi",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz.",
+"Edit name" => "İsmi düzenle",
+"No files selected for upload." => "Yükleme için dosya seçilmedi.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. ",
+"Select type" => "Tür seç",
+"Result: " => "Sonuç: ",
+" imported, " => " içe aktarıldı, ",
+" failed." => " hatalı.",
 "Addressbook not found." => "Adres defteri bulunamadı.",
 "This is not your addressbook." => "Bu sizin adres defteriniz değil.",
 "Contact could not be found." => "Kişi bulunamadı.",
@@ -60,25 +83,54 @@
 "Video" => "Video",
 "Pager" => "Sayfalayıcı",
 "Internet" => "İnternet",
+"Birthday" => "Doğum günü",
+"Business" => "İş",
+"Call" => "Çağrı",
+"Clients" => "Müşteriler",
+"Deliverer" => "Dağıtıcı",
+"Holidays" => "Tatiller",
+"Ideas" => "Fikirler",
+"Journey" => "Seyahat",
+"Jubilee" => "Yıl Dönümü",
+"Meeting" => "Toplantı",
+"Other" => "Diğer",
+"Personal" => "Kişisel",
+"Projects" => "Projeler",
+"Questions" => "Sorular",
 "{name}'s Birthday" => "{name}'nin Doğumgünü",
-"Contact" => "Kişi",
 "Add Contact" => "Kişi Ekle",
+"Import" => "İçe aktar",
 "Addressbooks" => "Adres defterleri",
+"Close" => "Kapat",
+"Keyboard shortcuts" => "Klavye kısayolları",
+"Navigation" => "Dolaşım",
+"Next contact in list" => "Listedeki sonraki kişi",
+"Previous contact in list" => "Listedeki önceki kişi",
+"Expand/collapse current addressbook" => "Şuanki adres defterini genişlet/daralt",
+"Next/previous addressbook" => "Sonraki/Önceki adres defteri",
+"Actions" => "Eylemler",
+"Refresh contacts list" => "Kişi listesini tazele",
+"Add new contact" => "Yeni kişi ekle",
+"Add new addressbook" => "Yeni adres defteri ekle",
+"Delete current contact" => "Şuanki kişiyi sil",
 "Configure Address Books" => "Adres Defterlerini Yapılandır",
 "New Address Book" => "Yeni Adres Defteri",
-"Import from VCF" => "VCF'den içeri aktar",
 "CardDav Link" => "CardDav Bağlantısı",
 "Download" => "İndir",
 "Edit" => "Düzenle",
 "Delete" => "Sil",
-"Download contact" => "Kişiyi indir",
-"Delete contact" => "Kişiyi sil",
 "Drop photo to upload" => "Fotoğrafı yüklenmesi için bırakın",
+"Delete current photo" => "Mevcut fotoğrafı sil",
+"Edit current photo" => "Mevcut fotoğrafı düzenle",
+"Upload new photo" => "Yeni fotoğraf yükle",
+"Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters",
 "Edit name details" => "İsim detaylarını düzenle",
 "Nickname" => "Takma ad",
 "Enter nickname" => "Takma adı girin",
-"Birthday" => "Doğum günü",
+"Web site" => "Web sitesi",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Web sitesine git",
 "dd-mm-yyyy" => "gg-aa-yyyy",
 "Groups" => "Gruplar",
 "Separate groups with commas" => "Grupları birbirinden virgülle ayırın",
@@ -94,24 +146,24 @@
 "Edit address details" => "Adres detaylarını düzenle",
 "Add notes here." => "Notları buraya ekleyin.",
 "Add field" => "Alan ekle",
-"Profile picture" => "Profil resmi",
 "Phone" => "Telefon",
 "Note" => "Not",
-"Delete current photo" => "Mevcut fotoğrafı sil",
-"Edit current photo" => "Mevcut fotoğrafı düzenle",
-"Upload new photo" => "Yeni fotoğraf yükle",
-"Select photo from ownCloud" => "ownCloud'dan bir fotoğraf seç",
+"Download contact" => "Kişiyi indir",
+"Delete contact" => "Kişiyi sil",
+"The temporary image has been removed from cache." => "Geçici resim ön bellekten silinmiştir.",
 "Edit address" => "Adresi düzenle",
 "Type" => "Tür",
 "PO Box" => "Posta Kutusu",
+"Street address" => "Sokak adresi",
+"Street and number" => "Sokak ve Numara",
 "Extended" => "Uzatılmış",
-"Street" => "Sokak",
+"Apartment number etc." => "Apartman numarası vb.",
 "City" => "Şehir",
 "Region" => "Bölge",
+"E.g. state or province" => "Örn. eyalet veya il",
 "Zipcode" => "Posta kodu",
+"Postal code" => "Posta kodu",
 "Country" => "Ülke",
-"Edit categories" => "Kategorileri düzenle",
-"Add" => "Ekle",
 "Addressbook" => "Adres defteri",
 "Hon. prefixes" => "Kısaltmalar",
 "Miss" => "Bayan",
@@ -143,15 +195,16 @@
 "Please choose the addressbook" => "Yeni adres defterini seç",
 "create a new addressbook" => "Yeni adres defteri oluştur",
 "Name of new addressbook" => "Yeni adres defteri için isim",
-"Import" => "İçe aktar",
 "Importing contacts" => "Bağlantıları içe aktar",
-"Select address book to import to:" => "İçe aktarılacak adres defterini seçin:",
-"Select from HD" => "HD'den seç",
 "You have no contacts in your addressbook." => "Adres defterinizde hiç bağlantı yok.",
 "Add contact" => "Bağlatı ekle",
 "Configure addressbooks" => "Adres defterini yapılandır",
+"Select Address Books" => "Adres deftelerini seçiniz",
+"Enter name" => "İsim giriniz",
+"Enter description" => "Tanım giriniz",
 "CardDAV syncing addresses" => "CardDAV adresleri eşzamanlıyor",
 "more info" => "daha fazla bilgi",
 "Primary address (Kontact et al)" => "Birincil adres (Bağlantı ve arkadaşları)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Read only vCard directory link(s)" => "Sadece okunabilir vCard dizin link(ler)i"
 );
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
index 4c27acf543e57768c49e8a84ae991db7859da37c..5959f1ff7e2b9b31463443b6b68bea59b6172d14 100644
--- a/apps/contacts/l10n/uk.php
+++ b/apps/contacts/l10n/uk.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "At least one of the address fields has to be filled out." => "Має бути заповнено щонайменше одне поле.",
-"Error adding addressbook." => "Помилка при додаванні адресної книги.",
 "This is not your addressbook." => "Це не ваша адресна книга.",
 "Address" => "Адреса",
 "Telephone" => "Телефон",
@@ -12,18 +11,16 @@
 "Fax" => "Факс",
 "Video" => "Відео",
 "Pager" => "Пейджер",
+"Birthday" => "День народження",
 "Add Contact" => "Додати контакт",
 "New Address Book" => "Нова адресна книга",
 "Download" => "Завантажити",
 "Delete" => "Видалити",
-"Delete contact" => "Видалити контакт",
-"Birthday" => "День народження",
 "Phone" => "Телефон",
+"Delete contact" => "Видалити контакт",
 "Extended" => "Розширено",
-"Street" => "Вулиця",
 "City" => "Місто",
 "Zipcode" => "Поштовий індекс",
 "Country" => "Країна",
-"Add" => "Додати",
 "Displayname" => "Відображуване ім'я"
 );
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index dcf9b99bc8b1e98e98749fd96289353d4088db30..affc75e3dfe633570c3eaa1462a7bea26b5c1a87 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "(取消)激活地址簿错误。",
 "There was an error adding the contact." => "添加联系人时出错。",
+"element name is not set." => "元素名称未设置",
+"id is not set." => "没有设置 id。",
 "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." => "添加联系人属性错误。",
 "No ID provided" => "未提供 ID",
 "Error setting checksum." => "设置校验值错误。",
 "No categories selected for deletion." => "未选中要删除的分类。",
@@ -12,28 +13,55 @@
 "No contacts found." => "找不到联系人。",
 "Missing ID" => "缺少 ID",
 "Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard:“",
-"Cannot add addressbook with an empty name." => "无法无姓名的地址簿。",
-"Error adding addressbook." => "添加地址簿错误。",
-"Error activating addressbook." => "激活地址簿错误。",
 "No contact ID was submitted." => "未提交联系人 ID。",
 "Error reading contact photo." => "读取联系人照片错误。",
 "Error saving temporary file." => "保存临时文件错误。",
 "The loading photo is not valid." => "装入的照片不正确。",
-"id is not set." => "没有设置 id。",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
 "Error deleting contact property." => "删除联系人属性错误。",
 "Contact ID is missing." => "缺少联系人 ID。",
-"Missing contact id." => "缺少联系人 ID。",
 "No photo path was submitted." => "未提供照片路径。",
 "File doesn't exist:" => "文件不存在:",
 "Error loading image." => "加载图片错误。",
+"Error getting contact object." => "获取联系人目标时出错。",
+"Error getting PHOTO property." => "获取照片属性时出错。",
+"Error saving contact." => "保存联系人时出错。",
+"Error resizing image" => "缩放图像时出错",
+"Error cropping image" => "裁切图像时出错",
+"Error creating temporary image" => "创建临时图像时出错",
+"Error finding image: " => "查找图像时出错: ",
 "checksum is not set." => "未设置校验值。",
+"Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
+"Something went FUBAR. " => "有一些信息无法被处理。",
 "Error updating contact property." => "更新联系人属性错误。",
+"Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
 "Error updating addressbook." => "更新地址簿错误",
+"Error uploading contacts to storage." => "上传联系人到存储空间时出错",
+"There is no error, the file uploaded with success" => "文件上传成功,没有错误发生",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
 "The uploaded file was only partially uploaded" => "已上传文件只上传了部分",
 "No file was uploaded" => "没有文件被上传",
 "Missing a temporary folder" => "缺少临时目录",
+"Couldn't save temporary image: " => "无法保存临时图像: ",
+"Couldn't load temporary image: " => "无法加载临时图像: ",
+"No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
 "Contacts" => "联系人",
+"Sorry, this functionality has not been implemented yet" => "抱歉,这个功能暂时还没有被实现",
+"Not implemented" => "未实现",
+"Couldn't get a valid address." => "无法获取一个合法的地址。",
+"Error" => "错误",
+"Contact" => "联系人",
+"This property has to be non-empty." => "这个属性必须是非空的",
+"Couldn't serialize elements." => "无法序列化元素",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误",
+"Edit name" => "编辑名称",
+"No files selected for upload." => "没有选择文件以上传",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "您试图上传的文件超出了该服务器的最大文件限制",
+"Select type" => "选择类型",
+"Result: " => "结果: ",
+" imported, " => " 已导入, ",
+" failed." => " 失败。",
 "Addressbook not found." => "未找到地址簿。",
 "This is not your addressbook." => "这不是您的地址簿。",
 "Contact could not be found." => "无法找到联系人。",
@@ -51,24 +79,27 @@
 "Video" => "视频",
 "Pager" => "传呼机",
 "Internet" => "互联网",
+"Birthday" => "生日",
 "{name}'s Birthday" => "{name} 的生日",
-"Contact" => "联系人",
 "Add Contact" => "添加联系人",
+"Import" => "导入",
 "Addressbooks" => "地址簿",
+"Close" => "关闭",
 "Configure Address Books" => "配置地址簿",
 "New Address Book" => "新建地址簿",
-"Import from VCF" => "从 VCF 导入",
 "CardDav Link" => "CardDav 链接",
 "Download" => "下载",
 "Edit" => "编辑",
 "Delete" => "删除",
-"Download contact" => "下载联系人",
-"Delete 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" => "编辑名称详情",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
-"Birthday" => "生日",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "分组",
 "Separate groups with commas" => "用逗号隔开分组",
@@ -84,27 +115,39 @@
 "Edit address details" => "编辑地址细节。",
 "Add notes here." => "添加注释。",
 "Add field" => "添加字段",
-"Profile picture" => "联系人图片",
 "Phone" => "电话",
 "Note" => "注释",
-"Delete current photo" => "删除当前照片",
-"Edit current photo" => "编辑当前照片",
-"Upload new photo" => "上传新照片",
-"Select photo from ownCloud" => "从 ownCloud 选择照片",
+"Download contact" => "下载联系人",
+"Delete contact" => "删除联系人",
+"The temporary image has been removed from cache." => "临时图像文件已从缓存中删除",
 "Edit address" => "编辑地址",
 "Type" => "类型",
 "PO Box" => "邮箱",
 "Extended" => "扩展",
-"Street" => "街道",
 "City" => "城市",
 "Region" => "地区",
 "Zipcode" => "邮编",
 "Country" => "国家",
-"Edit categories" => "编辑分类",
-"Add" => "添加",
 "Addressbook" => "地址簿",
+"Hon. prefixes" => "名誉字首",
+"Miss" => "小姐",
+"Ms" => "女士",
+"Mr" => "先生",
+"Sir" => "先生",
+"Mrs" => "夫人",
+"Dr" => "博士",
 "Given name" => "名",
+"Additional names" => "其他名称",
 "Family name" => "姓",
+"Hon. suffixes" => "名誉后缀",
+"J.D." => "法律博士",
+"M.D." => "医学博士",
+"D.O." => "骨科医学博士",
+"D.C." => "教育学博士",
+"Ph.D." => "哲学博士",
+"Esq." => "先生",
+"Jr." => "小",
+"Sn." => "老",
 "New Addressbook" => "新建地址簿",
 "Edit Addressbook" => "编辑地址簿",
 "Displayname" => "显示名称",
@@ -116,8 +159,8 @@
 "Please choose the addressbook" => "请选择地址簿",
 "create a new addressbook" => "创建新地址簿",
 "Name of new addressbook" => "新地址簿名称",
-"Import" => "导入",
 "Importing contacts" => "导入联系人",
+"You have no contacts in your addressbook." => "您的地址簿中没有联系人。",
 "Add contact" => "添加联系人",
 "Configure addressbooks" => "配置地址簿",
 "CardDAV syncing addresses" => "CardDAV 同步地址",
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index d4c2efc47aa30be1bcd7db002684e69c6b21a847..5647c6bcaa4b34045e7d2533f96594df505b8baa 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -3,18 +3,16 @@
 "There was an error adding the contact." => "添加通訊錄發生錯誤",
 "Cannot add empty property." => "不可添加空白內容",
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
-"Error adding contact property." => "添加通訊錄內容中發生錯誤",
 "No ID provided" => "未提供 ID",
 "No contacts found." => "沒有找到聯絡人",
 "Missing ID" => "遺失ID",
-"Error adding addressbook." => "添加電話簿中發生錯誤",
-"Error activating addressbook." => "啟用電話簿中發生錯誤",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確,請重新載入此頁。",
 "Error deleting contact property." => "刪除通訊錄內容中發生錯誤",
 "Error updating contact property." => "更新通訊錄內容中發生錯誤",
 "Error updating addressbook." => "電話簿更新中發生錯誤",
 "No file was uploaded" => "沒有已上傳的檔案",
 "Contacts" => "通訊錄",
+"Contact" => "通訊錄",
 "Addressbook not found." => "找不到通訊錄",
 "This is not your addressbook." => "這不是你的電話簿",
 "Contact could not be found." => "通訊錄未發現",
@@ -32,23 +30,19 @@
 "Video" => "影片",
 "Pager" => "呼叫器",
 "Internet" => "網際網路",
+"Birthday" => "生日",
 "{name}'s Birthday" => "{name}的生日",
-"Contact" => "通訊錄",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
 "Configure Address Books" => "設定通訊錄",
 "New Address Book" => "新電話簿",
-"Import from VCF" => "從VCF匯入",
 "CardDav Link" => "CardDav 聯結",
 "Download" => "下載",
 "Edit" => "編輯",
 "Delete" => "刪除",
-"Download contact" => "下載通訊錄",
-"Delete contact" => "刪除通訊錄",
 "Edit name details" => "編輯姓名詳細資訊",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
-"Birthday" => "生日",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "群組",
 "Separate groups with commas" => "用逗號分隔群組",
@@ -63,18 +57,17 @@
 "Edit address details" => "電子郵件住址詳細資訊",
 "Add notes here." => "在這裡新增註解",
 "Add field" => "新增欄位",
-"Profile picture" => "個人資料照片",
 "Phone" => "電話",
 "Note" => "註解",
+"Download contact" => "下載通訊錄",
+"Delete contact" => "刪除通訊錄",
 "Type" => "類型",
 "PO Box" => "通訊地址",
 "Extended" => "分機",
-"Street" => "街道",
 "City" => "城市",
 "Region" => "地區",
 "Zipcode" => "郵遞區號",
 "Country" => "國家",
-"Add" => "添加",
 "Addressbook" => "電話簿",
 "Mr" => "先生",
 "Sir" => "先生",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 329f306d9e8ca2b3065467bbb4e19607ebf19be9..624e08959feb8c14a5b035b4a058cb2086d2ecd1 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -5,15 +5,30 @@
 "The uploaded file was only partially uploaded" => "Файлът е качен частично",
 "No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временната папка",
+"Failed to write to disk" => "Грешка при запис на диска",
 "Files" => "Файлове",
 "Delete" => "Изтриване",
+"Upload Error" => "Грешка при качване",
+"Upload cancelled." => "Качването е отменено.",
+"Invalid name, '/' is not allowed." => "Неправилно име – \"/\" не е позволено.",
 "Size" => "Размер",
 "Modified" => "Променено",
+"folder" => "папка",
+"folders" => "папки",
+"file" => "файл",
 "Maximum upload size" => "Макс. размер за качване",
+"0 is unlimited" => "0 означава без ограничение",
+"New" => "Нов",
+"Text file" => "Текстов файл",
+"Folder" => "Папка",
+"From url" => "От url-адрес",
 "Upload" => "Качване",
+"Cancel upload" => "Отказване на качването",
 "Nothing in here. Upload something!" => "Няма нищо, качете нещо!",
 "Name" => "Име",
+"Share" => "Споделяне",
 "Download" => "Изтегляне",
 "Upload too large" => "Файлът е прекалено голям",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
 );
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index c23746ac5acaf1a34994d5285fe29a1ce2d90f0b..35be26926965ee734140e7dab6dfac6e93a1c268 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -9,6 +9,8 @@
 "Files" => "Fitxers",
 "Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
+"undo" => "desfés",
+"deleted" => "esborrat",
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
 "Upload Error" => "Error en la pujada",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index ea7ffa5ac54b2214e89fe9eb7519dc099f55adae..1f4b076ee47c2daecb0ba13171af342621ea6ea2 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -9,6 +9,8 @@
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr teilen",
 "Delete" => "Löschen",
+"undo" => "rückgängig machen",
+"deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Datei kann nicht hochgeladen werden da sie ein Verzeichniss ist oder 0 bytes hat.",
 "Upload Error" => "Fehler beim Hochladen",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index e1376aa42b17db2a6a4ec884419ec39f7800dbc8..6b6414f9252add36880935b83cc998736de5e15f 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -9,6 +9,8 @@
 "Files" => "Archivos",
 "Unshare" => "No compartir",
 "Delete" => "Eliminado",
+"undo" => "deshacer",
+"deleted" => "borrado",
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index ca3d03ad6f7cddfe65ae6fd04e2e926d3f58b4db..e037c7a2f4bd36f19a0ef3efe555af1e9e65f425 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -9,6 +9,8 @@
 "Files" => "Fichiers",
 "Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
+"undo" => "annuler",
+"deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Générer un fichier ZIP, cela peut prendre du temps",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
 "Upload Error" => "Erreur de chargement",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 35ee7a5fdd167276ef328d8ec40e0e422d29cb85..d3dc1a3d08a41893dc1764d1025983ac6c1bc3f2 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -9,6 +9,8 @@
 "Files" => "File",
 "Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
+"undo" => "annulla",
+"deleted" => "eliminati",
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
 "Upload Error" => "Errore di invio",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 67a29b46613d61070ab05bd75314d7856f071aef..811e983bb96f7a1017b6944aff6feda5adb5a67a 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -8,6 +8,8 @@
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
 "Delete" => "Usuwa element",
+"undo" => "wróć",
+"deleted" => "skasuj",
 "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
 "Upload Error" => "Błąd wczytywania",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 99bb6df8f871832aebe390bad633b86fac97ac92..145dc6ce0bf6020fc5a31bceb3bc41190331655c 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,7 +7,10 @@
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Unshare" => "Снять общий доступ",
 "Delete" => "Удалить",
+"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/sl.php b/apps/files/l10n/sl.php
index a4f3b578885b014ab43107530e6d101b950c9dec..0fd9e9a06c54149b21fbe4e14ddc9909bedca8e9 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -9,6 +9,8 @@
 "Files" => "Datoteke",
 "Unshare" => "Vzemi iz souporabe",
 "Delete" => "Izbriši",
+"undo" => "razveljavi",
+"deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
 "Upload Error" => "Napaka pri nalaganju",
@@ -37,7 +39,7 @@
 "Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",
 "Name" => "Ime",
 "Share" => "Souporaba",
-"Download" => "Prejmi",
+"Download" => "Prenesi",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",
 "Files are being scanned, please wait." => "Preiskujem datoteke, prosimo počakajte.",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index f3d936ff845d71101631119b0fb05dfbbff49024..bdce67c3d4914c2acc883a155438219f5465d0c0 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -9,6 +9,8 @@
 "Files" => "Filer",
 "Unshare" => "Sluta dela",
 "Delete" => "Ta bort",
+"undo" => "ångra",
+"deleted" => "raderad",
 "generating ZIP-file, it may take some time." => "Gererar ZIP-fil. Det kan ta lite tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
 "Upload Error" => "Uppladdningsfel",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 0ecbcadb4865fd55081f3c42dceee4869be8eaa2..faa5cc10b787ba371b2b6a1b6eec82b0aee0ca96 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,7 +7,10 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Unshare" => "Paylaşılmayan",
 "Delete" => "Sil",
+"undo" => "geri al",
+"deleted" => "silindi",
 "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
 "Upload Error" => "Yükleme hatası",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 743bc57feeba73c219d6701150d2a95c893a06f8..0b535bf3845ec6bc64e71da9d943c4af229c2c0e 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,17 +6,37 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
+"Unshare" => "Заборонити доступ",
 "Delete" => "Видалити",
+"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" => "Помилка завантаження",
+"Pending" => "Очікування",
+"Upload cancelled." => "Завантаження перервано.",
+"Invalid name, '/' is not allowed." => "Некоректне ім'я, '/' не дозволено.",
 "Size" => "Розмір",
 "Modified" => "Змінено",
+"folder" => "тека",
+"folders" => "теки",
+"file" => "файл",
+"files" => "файли",
 "Maximum upload size" => "Максимальний розмір відвантажень",
+"max. possible: " => "макс.можливе:",
+"0 is unlimited" => "0 є безліміт",
 "New" => "Створити",
 "Text file" => "Текстовий файл",
 "Folder" => "Папка",
+"From url" => "З URL",
 "Upload" => "Відвантажити",
+"Cancel upload" => "Перервати завантаження",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Name" => "Ім'я",
+"Share" => "Поділитися",
 "Download" => "Завантажити",
 "Upload too large" => "Файл занадто великий",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
+"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
+"Current scanning" => "Поточне сканування"
 );
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
index 1ff636ac2a0f47e2c3f9d558d35f2e7c7120f2ec..8c0bd0cb98d8067e6b85465457762e9f3cd2089a 100644
--- a/apps/gallery/l10n/pl.php
+++ b/apps/gallery/l10n/pl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Zdjęcia",
-"Settings" => "Ustawienia",
-"Rescan" => "Przeszukaj",
-"Stop" => "Stop",
-"Share" => "Współdziel",
+"Share gallery" => "Udostępnij galerię",
+"Error: " => "Błąd: ",
+"Internal error" => "Błąd wewnętrzny",
+"Slideshow" => "Pokaz slajdów",
 "Back" => "Wróć",
 "Remove confirmation" => "Usuń potwierdzenie",
 "Do you want to remove album" => "Czy chcesz usunąć album",
diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php
index c42592448cbf08ac72686057c5c7845a0d07c4bf..7d007fa66e1b3007ab057ac1b2990a93885184a4 100644
--- a/apps/gallery/l10n/tr.php
+++ b/apps/gallery/l10n/tr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Resimler",
-"Settings" => "Ayarlar",
-"Rescan" => "Yeniden Tara ",
-"Stop" => "Durdur",
-"Share" => "Paylaş",
+"Share gallery" => "Galeriyi paylaş",
+"Error: " => "Hata: ",
+"Internal error" => "İç hata",
+"Slideshow" => "Slide Gösterim",
 "Back" => "Geri",
 "Remove confirmation" => "Doğrulamayı kaldır",
 "Do you want to remove album" => "Albümü silmek istiyor musunuz",
diff --git a/apps/media/l10n/bg_BG.php b/apps/media/l10n/bg_BG.php
index 1b71b26a16595c196d123551ab2aad1339647fba..e6c3c02d17f876864ec3c3d13fdc5a996ae5c4a2 100644
--- a/apps/media/l10n/bg_BG.php
+++ b/apps/media/l10n/bg_BG.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Музика",
+"Add album to playlist" => "Добавяне на албума към списъка за изпълнение",
 "Play" => "Пусни",
 "Pause" => "Пауза",
 "Previous" => "Предишна",
diff --git a/apps/media/l10n/uk.php b/apps/media/l10n/uk.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ac7abbf2b2b92965fe35485562f2632fbfe18eb
--- /dev/null
+++ b/apps/media/l10n/uk.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Музика",
+"Add album to playlist" => "Додати альбом до плейлиста",
+"Play" => "Грати",
+"Pause" => "Пауза",
+"Previous" => "Попередній",
+"Next" => "Наступний",
+"Mute" => "Звук вкл.",
+"Unmute" => "Звук викл.",
+"Rescan Collection" => "Повторне сканування колекції",
+"Artist" => "Виконавець",
+"Album" => "Альбом",
+"Title" => "Заголовок"
+);
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 8a6ba6e9a7859e7485eb6716954c1ceaa42708ba..4b694f33bd805db6dd7f7e6cc760af11f4c39d56 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "استرجاع كلمة السر",
+"Settings" => "تعديلات",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
 "Requested" => "تم طلب",
@@ -29,7 +29,6 @@
 "Finish setup" => "انهاء التعديلات",
 "web services under your control" => "خدمات الوب تحت تصرفك",
 "Log out" => "الخروج",
-"Settings" => "تعديلات",
 "Lost your password?" => "هل نسيت كلمة السر؟",
 "remember" => "تذكر",
 "Log in" => "أدخل",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 46047a35350a2b78e480f4439464cc42fda23a9f..19b32a700ba6e7f69f14194849be586cf43b4ecb 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,24 @@
 <?php $TRANSLATIONS = array(
+"This category already exists: " => "Категорията вече съществува:",
+"Settings" => "Настройки",
+"January" => "Януари",
+"February" => "Февруари",
+"March" => "Март",
+"April" => "Април",
+"May" => "Май",
+"June" => "Юни",
+"July" => "Юли",
+"August" => "Август",
+"September" => "Септември",
+"October" => "Октомври",
+"November" => "Ноември",
+"December" => "Декември",
+"Cancel" => "Отказ",
+"No" => "Не",
+"Yes" => "Да",
+"Ok" => "Добре",
+"No categories selected for deletion." => "Няма избрани категории за изтриване",
+"Error" => "Грешка",
 "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
 "Requested" => "Заявено",
 "Login failed!" => "Входа пропадна!",
@@ -12,7 +32,10 @@
 "Apps" => "Програми",
 "Admin" => "Админ",
 "Help" => "Помощ",
+"Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
+"Edit categories" => "Редактиране на категориите",
+"Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
 "Password" => "Парола",
 "Advanced" => "Разширено",
@@ -25,9 +48,9 @@
 "Database host" => "Хост за базата",
 "Finish setup" => "Завършване на настройките",
 "Log out" => "Изход",
-"Settings" => "Настройки",
 "Lost your password?" => "Забравена парола?",
 "remember" => "запомни",
+"Log in" => "Вход",
 "You are logged out." => "Вие излязохте.",
 "prev" => "пред.",
 "next" => "следващо"
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index baeb8bd55bba5f3a56986e2d0178eca1c1039675..9be2fe6adfc0d3bd0789e1cbaa9d3231869a54f4 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "No s'ha facilitat cap nom per l'aplicació.",
 "No category to add?" => "No voleu afegir cap categoria?",
 "This category already exists: " => "Aquesta categoria ja existeix:",
-"Owncloud password reset" => "Restableix la contrasenya d'Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Arranjament",
+"January" => "Gener",
+"February" => "Febrer",
+"March" => "Març",
+"April" => "Abril",
+"May" => "Maig",
+"June" => "Juny",
+"July" => "Juliol",
+"August" => "Agost",
+"September" => "Setembre",
+"October" => "Octubre",
+"November" => "Novembre",
+"December" => "Desembre",
+"Cancel" => "Cancel·la",
+"No" => "No",
+"Yes" => "Sí",
+"Ok" => "D'acord",
+"No categories selected for deletion." => "No hi ha categories per eliminar.",
+"Error" => "Error",
 "ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Acaba la configuració",
 "web services under your control" => "controleu els vostres serveis web",
 "Log out" => "Surt",
-"Settings" => "Arranjament",
 "Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
 "Log in" => "Inici de sessió",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4ad9508f8131513b23344dc106dcb9aad40ad209..7daeb52e6313d02c7cdb73298668fdc93caa66c4 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Jméno aplikace nezadáno.",
 "No category to add?" => "Žádná kategorie k přidání?",
 "This category already exists: " => "Tato kategorie již existuje:",
-"Owncloud password reset" => "Reset hesla Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nastavení",
+"January" => "Leden",
+"February" => "Únor",
+"March" => "Březen",
+"April" => "Duben",
+"May" => "Květen",
+"June" => "Červen",
+"July" => "Červenec",
+"August" => "Srpen",
+"September" => "Září",
+"October" => "Říjen",
+"November" => "Listopad",
+"December" => "Prosinec",
+"Cancel" => "Zrušit",
+"No" => "Ne",
+"Yes" => "Ano",
+"Ok" => "Budiž",
+"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
+"Error" => "Chyba",
 "ownCloud password reset" => "Reset hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo vyresetujete použitím následujícího odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude Vám zaslán odkaz pro obnovu hesla",
@@ -36,7 +55,6 @@
 "Finish setup" => "Dokončit instalaci",
 "web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
-"Settings" => "Nastavení",
 "Lost your password?" => "Zapomenuté heslo?",
 "remember" => "zapamatovat si",
 "Log in" => "Login",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index f7b5b48f6fbe507dc1c47162ec315504621f0994..5e62b5b95dbead9889c1ad08a51c8215eab21e65 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Applikationens navn ikke medsendt",
 "No category to add?" => "Ingen kategori at tilføje?",
 "This category already exists: " => "Denne kategori eksisterer allerede: ",
-"Owncloud password reset" => "Nulstil adgangskode til Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Indstillinger",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Marts",
+"April" => "April",
+"May" => "Maj",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Fortryd",
+"No" => "Nej",
+"Yes" => "Ja",
+"Ok" => "OK",
+"No categories selected for deletion." => "Ingen kategorier valgt",
+"Error" => "Fejl",
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Afslut opsætning",
 "web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
-"Settings" => "Indstillinger",
 "Lost your password?" => "Mistet dit kodeord?",
 "remember" => "husk",
 "Log in" => "Log ind",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 549f184c269dc21d3685a2fc0ec0d050d2c09df3..121d17f6a8b7404391b4bfba8373ff7c0d07b4fd 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -3,6 +3,7 @@
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Einstellungen",
 "January" => "Januar",
 "February" => "Februar",
 "March" => "März",
@@ -54,7 +55,6 @@
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "web services under your control",
 "Log out" => "Abmelden",
-"Settings" => "Einstellungen",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 1adf14af967d82b697613164b4384133d8d3e2ff..d8f32fb51e02d2addfad1e09d3400e11339e733b 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Δε προσδιορίστηκε όνομα εφαρμογής",
 "No category to add?" => "Δεν έχετε να προστέσθέσεται μια κα",
 "This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη",
-"Owncloud password reset" => "Επανέκδοση κωδικού για το Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ρυθμίσεις",
+"January" => "Ιανουάριος",
+"February" => "Φεβρουάριος",
+"March" => "Μάρτιος",
+"April" => "Απρίλιος",
+"May" => "Μάϊος",
+"June" => "Ιούνιος",
+"July" => "Ιούλιος",
+"August" => "Αύγουστος",
+"September" => "Σεπτέμβριος",
+"October" => "Οκτώβριος",
+"November" => "Νοέμβριος",
+"December" => "Δεκέμβριος",
+"Cancel" => "Ακύρωση",
+"No" => "Όχι",
+"Yes" => "Ναι",
+"Ok" => "Οκ",
+"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή",
+"Error" => "Σφάλμα",
 "ownCloud password reset" => "Επαναφορά κωδικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
 "Log out" => "Αποσύνδεση",
-"Settings" => "Ρυθμίσεις",
 "Lost your password?" => "Ξεχάσατε τον κωδικό σας;",
 "remember" => "να με θυμάσαι",
 "Log in" => "Είσοδος",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 0ae2aeac691c2dbc2b19058e83d51de971f62b0a..f5e5ca9d0e1dca1f6172eab020199c501746f232 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,5 +1,28 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "La pasvorto de Owncloud estas restarigita",
+"Application name not provided." => "Nomo de aplikaĵo ne proviziiĝis.",
+"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
+"This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Agordo",
+"January" => "Januaro",
+"February" => "Februaro",
+"March" => "Marto",
+"April" => "Aprilo",
+"May" => "Majo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Aŭgusto",
+"September" => "Septembro",
+"October" => "Oktobro",
+"November" => "Novembro",
+"December" => "Decembro",
+"Cancel" => "Nuligi",
+"No" => "Ne",
+"Yes" => "Jes",
+"Ok" => "Akcepti",
+"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
+"Error" => "Eraro",
+"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
 "Requested" => "Petita",
@@ -15,7 +38,10 @@
 "Apps" => "Aplikaĵoj",
 "Admin" => "Administranto",
 "Help" => "Helpo",
+"Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
+"Edit categories" => "Redakti kategoriojn",
+"Add" => "Aldoni",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Password" => "Pasvorto",
 "Advanced" => "Progresinta",
@@ -29,7 +55,6 @@
 "Finish setup" => "Fini la instalon",
 "web services under your control" => "TTT-servoj sub via kontrolo",
 "Log out" => "Elsaluti",
-"Settings" => "Agordo",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
 "Log in" => "Ensaluti",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2d6068ed5f86d3211788fa2d27fb03127f3f2aba..31d8d792a4165203bf379ce2fe29d5cda0b8617e 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nombre de la aplicación no provisto.",
 "No category to add?" => "¿Ninguna categoría para agregar?",
 "This category already exists: " => "Esta categoría ya existe: ",
-"Owncloud password reset" => "Restablecer contraseña de ownCloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ajustes",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
+"Cancel" => "Cancelar",
+"No" => "No",
+"Yes" => "Sí",
+"Ok" => "Vale",
+"No categories selected for deletion." => "No hay categorias seleccionadas para borrar.",
+"Error" => "Fallo",
 "ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
@@ -36,7 +55,6 @@
 "Finish setup" => "Completar la instalación",
 "web services under your control" => "servicios web bajo tu control",
 "Log out" => "Salir",
-"Settings" => "Ajustes",
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "Log in" => "Entrar",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 7ecfb278afd118389ef8528e86c6f6e1e4ddd457..734021605ca4733dbff20d1acbc84cce19e8cf25 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Rakenduse nime pole sisestatud.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
 "This category already exists: " => "See kategooria on juba olemas: ",
-"Owncloud password reset" => "Owncloud parooli taastamine",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Seaded",
+"January" => "Jaanuar",
+"February" => "Veebruar",
+"March" => "Märts",
+"April" => "Aprill",
+"May" => "Mai",
+"June" => "Juuni",
+"July" => "Juuli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktoober",
+"November" => "November",
+"December" => "Detsember",
+"Cancel" => "Loobu",
+"No" => "Ei",
+"Yes" => "Jah",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
+"Error" => "Viga",
 "ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Lõpeta seadistamine",
 "web services under your control" => "veebiteenused sinu kontrolli all",
 "Log out" => "Logi välja",
-"Settings" => "Seaded",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 3159350183f0c1f4801b259fb5fbd78b8009c00d..2e5a2c00e2a17c43799f79c71cd0fdf2ce414a47 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Aplikazioaren izena falta da",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: " => "Kategoria hau dagoeneko existitzen da:",
-"Owncloud password reset" => "Owncloudeko pasahitza berrezarri",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ezarpenak",
+"January" => "Urtarrila",
+"February" => "Otsaila",
+"March" => "Martxoa",
+"April" => "Apirila",
+"May" => "Maiatza",
+"June" => "Ekaina",
+"July" => "Uztaila",
+"August" => "Abuztua",
+"September" => "Iraila",
+"October" => "Urria",
+"November" => "Azaroa",
+"December" => "Abendua",
+"Cancel" => "Ezeztatu",
+"No" => "Ez",
+"Yes" => "Bai",
+"Ok" => "Ados",
+"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
+"Error" => "Errorea",
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Bukatu konfigurazioa",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
 "Log out" => "Saioa bukatu",
-"Settings" => "Ezarpenak",
 "Lost your password?" => "Galdu duzu pasahitza?",
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index e3cc3feddd8b9c882b83d5e30bdee9f8922212c1..5fe98629ba20ac70fd2c8ab46d7739a70845ada3 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "نام برنامه پیدا نشد",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
 "This category already exists: " => "این گروه از قبل اضافه شده",
-"Owncloud password reset" => "گذرواژه ابرهای شما تغییرکرد",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "تنظیمات",
+"January" => "ژانویه",
+"February" => "فبریه",
+"March" => "مارس",
+"April" => "آوریل",
+"May" => "می",
+"June" => "ژوئن",
+"July" => "جولای",
+"August" => "آگوست",
+"September" => "سپتامبر",
+"October" => "اکتبر",
+"November" => "نوامبر",
+"December" => "دسامبر",
+"Cancel" => "منصرف شدن",
+"No" => "نه",
+"Yes" => "بله",
+"Ok" => "قبول",
+"No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است",
+"Error" => "خطا",
 "ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
@@ -36,7 +55,6 @@
 "Finish setup" => "اتمام نصب",
 "web services under your control" => "سرویس وب تحت کنترل شما",
 "Log out" => "خروج",
-"Settings" => "تنظیمات",
 "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
 "remember" => "بیاد آوری",
 "Log in" => "ورود",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 6dc65ed4955e28b3163fb417fc1bc5db2a7e2f4e..64bb4dca631a7f8406e9e0dc3fc6389d892a0eec 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "Sovelluksen nimeä ei määritelty.",
 "No category to add?" => "Ei lisättävää luokkaa?",
 "This category already exists: " => "Tämä luokka on jo olemassa: ",
-"Owncloud password reset" => "Owncloud-salasanan nollaus",
+"Settings" => "Asetukset",
+"January" => "Tammikuu",
+"February" => "Helmikuu",
+"March" => "Maaliskuu",
+"April" => "Huhtikuu",
+"May" => "Toukokuu",
+"June" => "Kesäkuu",
+"July" => "Heinäkuu",
+"August" => "Elokuu",
+"September" => "Syyskuu",
+"October" => "Lokakuu",
+"November" => "Marraskuu",
+"December" => "Joulukuu",
+"Cancel" => "Peru",
+"No" => "Ei",
+"Yes" => "Kyllä",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
+"Error" => "Virhe",
 "ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
@@ -36,7 +54,6 @@
 "Finish setup" => "Viimeistele asennus",
 "web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
-"Settings" => "Asetukset",
 "Lost your password?" => "Unohditko salasanasi?",
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 8459fbbb6647c1f713dcf7bcb7226142e274c5a4..43917917ad8b3f357260777c6d2a1f46b5980e5a 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nom de l'application non fourni.",
 "No category to add?" => "Pas de catégorie à ajouter ?",
 "This category already exists: " => "Cette catégorie existe déjà : ",
-"Owncloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Paramètres",
+"January" => "Janvier",
+"February" => "Février",
+"March" => "Mars",
+"April" => "Avril",
+"May" => "Mai",
+"June" => "Juin",
+"July" => "Juillet",
+"August" => "Août",
+"September" => "Septembre",
+"October" => "Octobre",
+"November" => "Novembre",
+"December" => "Décembre",
+"Cancel" => "Annulé",
+"No" => "Non",
+"Yes" => "Oui",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
+"Error" => "Erreur",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe",
@@ -29,14 +48,13 @@
 "Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
 "will be used" => "sera utilisé",
-"Database user" => "Utilisateur de la base de données",
+"Database user" => "Utilisateur pour la base de données",
 "Database password" => "Mot de passe de la base de données",
 "Database name" => "Nom de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
 "web services under your control" => "services web sous votre contrôle",
 "Log out" => "Se déconnecter",
-"Settings" => "Paramètres",
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 8d839a6ac6c7911fefc29161bdde551cb173e085..eeff78826f868a5d7de8a86ee3d5ccfeb5a1867b 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Non se indicou o nome do aplicativo.",
 "No category to add?" => "Sen categoría que engadir?",
 "This category already exists: " => "Esta categoría xa existe: ",
-"Owncloud password reset" => "Restablecemento do contrasinal de Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Preferencias",
+"January" => "Xaneiro",
+"February" => "Febreiro",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Xuño",
+"July" => "Xullo",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Nadal",
+"Cancel" => "Cancelar",
+"No" => "Non",
+"Yes" => "Si",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.",
+"Error" => "Erro",
 "ownCloud password reset" => "Restablecer contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
@@ -36,7 +55,6 @@
 "Finish setup" => "Rematar configuración",
 "web services under your control" => "servizos web baixo o seu control",
 "Log out" => "Desconectar",
-"Settings" => "Preferencias",
 "Lost your password?" => "Perdeu o contrasinal?",
 "remember" => "lembrar",
 "Log in" => "Conectar",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1929681e0664d16ef3bdf73fd30fecc2d0e315ca..f0a18103a8fb57499650ca722c0e4cd911105839 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "שם היישום לא סופק.",
 "No category to add?" => "אין קטגוריה להוספה?",
 "This category already exists: " => "קטגוריה זאת כבר קיימת: ",
-"Owncloud password reset" => "איפוס הססמה של ownCloud",
+"Settings" => "הגדרות",
+"January" => "ינואר",
+"February" => "פברואר",
+"March" => "מרץ",
+"April" => "אפריל",
+"May" => "מאי",
+"June" => "יוני",
+"July" => "יולי",
+"August" => "אוגוסט",
+"September" => "ספטמבר",
+"October" => "אוקטובר",
+"November" => "נובמבר",
+"December" => "דצמבר",
+"Cancel" => "ביטול",
+"No" => "לא",
+"Yes" => "כן",
+"Ok" => "בסדר",
+"No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה",
+"Error" => "שגיאה",
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -36,7 +54,6 @@
 "Finish setup" => "סיום התקנה",
 "web services under your control" => "שירותי רשת בשליטתך",
 "Log out" => "התנתקות",
-"Settings" => "הגדרות",
 "Lost your password?" => "שכחת את ססמתך?",
 "remember" => "שמירת הססמה",
 "Log in" => "כניסה",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 92be8048045c7e749aba0fa258071e026d3013e3..d4e773afc1e525d602d68df029a0a5cc68a1cfc9 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Ime aplikacije nije pribavljeno.",
 "No category to add?" => "Nemate kategorija koje možete dodati?",
 "This category already exists: " => "Ova kategorija već postoji: ",
-"Owncloud password reset" => "ownCloud resetiranje lozinke",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Postavke",
+"January" => "Siječanj",
+"February" => "Veljača",
+"March" => "Ožujak",
+"April" => "Travanj",
+"May" => "Svibanj",
+"June" => "Lipanj",
+"July" => "Srpanj",
+"August" => "Kolovoz",
+"September" => "Rujan",
+"October" => "Listopad",
+"November" => "Studeni",
+"December" => "Prosinac",
+"Cancel" => "Odustani",
+"No" => "Ne",
+"Yes" => "Da",
+"Ok" => "U redu",
+"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
+"Error" => "Pogreška",
 "ownCloud password reset" => "ownCloud resetiranje lozinke",
 "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Završi postavljanje",
 "web services under your control" => "web usluge pod vašom kontrolom",
 "Log out" => "Odjava",
-"Settings" => "Postavke",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
 "Log in" => "Prijava",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index fc1337d8defc075eabaf59115cc3fef9fea5f314..dbfe2781d5fd45036145dc9829b9912a31f8c063 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -2,45 +2,63 @@
 "Application name not provided." => "Alkalmazásnév hiányzik",
 "No category to add?" => "Nincs hozzáadandó kategória?",
 "This category already exists: " => "Ez a kategória már létezik",
-"Owncloud password reset" => "ownCloud jelszó-visszaállítás",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Beállítások",
+"January" => "Január",
+"February" => "Február",
+"March" => "Március",
+"April" => "Április",
+"May" => "Május",
+"June" => "Június",
+"July" => "Július",
+"August" => "Augusztus",
+"September" => "Szeptember",
+"October" => "Október",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Mégse",
+"No" => "Nem",
+"Yes" => "Igen",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nincs törlésre jelölt kategória",
+"Error" => "Hiba",
 "ownCloud password reset" => "ownCloud jelszó-visszaállítás",
 "Use the following link to reset your password: {link}" => "Használja az alábbi linket a jelszó-visszaállításhoz: {link}",
 "You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
-"Requested" => "Kért",
+"Requested" => "Kérés elküldve",
 "Login failed!" => "Belépés sikertelen!",
-"Username" => "Felhasználói név",
+"Username" => "Felhasználónév",
 "Request reset" => "Visszaállítás igénylése",
-"Your password was reset" => "Jelszó megváltoztatásra került",
+"Your password was reset" => "Jelszó megváltoztatva",
 "To login page" => "A bejelentkező ablakhoz",
 "New password" => "Új jelszó",
-"Reset password" => "Jelszó beállítás",
+"Reset password" => "Jelszó-visszaállítás",
 "Personal" => "Személyes",
 "Users" => "Felhasználók",
 "Apps" => "Alkalmazások",
-"Admin" => "Adminisztráció",
+"Admin" => "Admin",
 "Help" => "Súgó",
 "Access forbidden" => "Hozzáférés tiltva",
-"Cloud not found" => "Nem talált felhő",
+"Cloud not found" => "A felhő nem található",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
-"Create an <strong>admin account</strong>" => "<strong>Adminisztrációs fiók</strong> létrehozása",
+"Create an <strong>admin account</strong>" => "<strong>Rendszergazdafiók</strong> létrehozása",
 "Password" => "Jelszó",
-"Advanced" => "Fejlett",
-"Data folder" => "Adat könyvtár",
+"Advanced" => "Haladó",
+"Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
 "will be used" => "használva lesz",
-"Database user" => "Adatbázis felhasználó",
+"Database user" => "Adatbázis felhasználónév",
 "Database password" => "Adatbázis jelszó",
 "Database name" => "Adatbázis név",
 "Database host" => "Adatbázis szerver",
-"Finish setup" => "Beállítások befejezése",
+"Finish setup" => "Beállítás befejezése",
 "web services under your control" => "webszolgáltatások az irányításod alatt",
 "Log out" => "Kilépés",
-"Settings" => "Beállítások",
 "Lost your password?" => "Elfelejtett jelszó?",
-"remember" => "emlékezni",
+"remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
-"You are logged out." => "Kilépés sikerült.",
+"You are logged out." => "Kilépett.",
 "prev" => "Előző",
 "next" => "Következő"
 );
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 97e8dfc147b982a0092e9efd7b58e4bbb1515093..e202daafa32886f72d0eaa4865ade358b4b76473 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This category already exists: " => "Iste categoria jam existe:",
-"Owncloud password reset" => "Reinitialisation del contrasigno de Owncloud",
+"Settings" => "Configurationes",
 "ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Requested" => "Requestate",
 "Login failed!" => "Initio de session fallite!",
@@ -31,7 +31,6 @@
 "Database host" => "Hospite de base de datos",
 "web services under your control" => "servicios web sub tu controlo",
 "Log out" => "Clauder le session",
-"Settings" => "Configurationes",
 "Lost your password?" => "Tu perdeva le contrasigno?",
 "remember" => "memora",
 "Log in" => "Aperir session",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index f9fa7d2bb9b64fdac42900907c5dd2ff5a844437..296e2d62a4a1839f0e72ceb5571a78cb766cdc45 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "Nama aplikasi tidak diberikan.",
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: " => "Kategori ini sudah ada:",
-"Owncloud password reset" => "Reset password Owncloud",
+"Settings" => "Setelan",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
@@ -36,7 +36,6 @@
 "Finish setup" => "Selesaikan instalasi",
 "web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
-"Settings" => "Setelan",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "Log in" => "Masuk",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ce2352f0335c3bf40a8cae37e276cb91edbdc55c..1c0bf94ca71b03d46e9390f7b2ce88000ee5e2b3 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nome dell'applicazione non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: " => "Questa categoria esiste già: ",
-"Owncloud password reset" => "Ripristino password di Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Impostazioni",
+"January" => "Gennaio",
+"February" => "Febbraio",
+"March" => "Marzo",
+"April" => "Aprile",
+"May" => "Maggio",
+"June" => "Giugno",
+"July" => "Luglio",
+"August" => "Agosto",
+"September" => "Settembre",
+"October" => "Ottobre",
+"November" => "Novembre",
+"December" => "Dicembre",
+"Cancel" => "Annulla",
+"No" => "No",
+"Yes" => "Sì",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
+"Error" => "Errore",
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
@@ -36,7 +55,6 @@
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
 "Log out" => "Esci",
-"Settings" => "Impostazioni",
 "Lost your password?" => "Hai perso la password?",
 "remember" => "ricorda",
 "Log in" => "Accedi",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 50b8e9e616ed14297fed3ffee8aa4b8617efc9b2..5f9b9da33a662c3a4b61296a7ac66e5cf4476c91 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "アプリケーション名は提供されていません。",
 "No category to add?" => "追加するカテゴリはありませんか?",
 "This category already exists: " => "このカテゴリはすでに存在します: ",
-"Owncloud password reset" => "Owncloud のパスワードをリセット",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "設定",
+"January" => "1月",
+"February" => "2月",
+"March" => "3月",
+"April" => "4月",
+"May" => "5月",
+"June" => "6月",
+"July" => "7月",
+"August" => "8月",
+"September" => "9月",
+"October" => "10月",
+"November" => "11月",
+"December" => "12月",
+"Cancel" => "キャンセル",
+"No" => "いいえ",
+"Yes" => "はい",
+"Ok" => "OK",
+"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
+"Error" => "エラー",
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
@@ -36,7 +55,6 @@
 "Finish setup" => "セットアップを完了します",
 "web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
-"Settings" => "設定",
 "Lost your password?" => "パスワードを忘れましたか?",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 44396b94f81e80e54c3a4870937f0aa750d1cdc5..5a330581ff1cd96cdf324f6eff01bd8c0b07c924 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "응용 프로그램의 이름이 규정되어 있지 않습니다. ",
 "No category to add?" => "추가할 카테고리가 없습니까?",
 "This category already exists: " => "이 카테고리는 이미 존재합니다:",
-"Owncloud password reset" => "Owncloud 암호 재설정",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "설정",
+"January" => "1월",
+"February" => "2월",
+"March" => "3월",
+"April" => "4월",
+"May" => "5월",
+"June" => "6월",
+"July" => "7월",
+"August" => "8월",
+"September" => "9월",
+"October" => "10월",
+"November" => "11월",
+"December" => "12월",
+"Cancel" => "취소",
+"No" => "아니오",
+"Yes" => "예",
+"Ok" => "승락",
+"No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다.",
+"Error" => "에러",
 "ownCloud password reset" => "ownCloud 비밀번호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}",
 "You will receive a link to reset your password via Email." => "전자 우편으로 암호 재설정 링크를 보냈습니다.",
@@ -36,7 +55,6 @@
 "Finish setup" => "설치 완료",
 "web services under your control" => "내가 관리하는 웹 서비스",
 "Log out" => "로그아웃",
-"Settings" => "설정",
 "Lost your password?" => "암호를 잊으셨습니까?",
 "remember" => "기억하기",
 "Log in" => "로그인",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index dd9420113843fe8a9950000e62d53dfa2bcf3372..eafdcc3737034a6a7be011149a28c65e4e1224eb 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "Numm vun der Applikatioun ass net uginn.",
 "No category to add?" => "Keng Kategorie fir bäizesetzen?",
 "This category already exists: " => "Des Kategorie existéiert schonn:",
-"Owncloud password reset" => "Owncloud Passwuert reset",
+"Settings" => "Astellungen",
 "ownCloud password reset" => "ownCloud Passwuert reset",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
@@ -36,7 +36,6 @@
 "Finish setup" => "Installatioun ofschléissen",
 "web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Log out" => "Ausloggen",
-"Settings" => "Astellungen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
 "Log in" => "Log dech an",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 5dedfffabd18619a39b16264b2ad34668bcbf71b..f36f697b67c62627aeacbc0403784be02969abab 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,6 +1,27 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nepateiktas programos pavadinimas.",
+"No category to add?" => "Nepridėsite jokios kategorijos?",
 "This category already exists: " => "Tokia kategorija jau yra:",
-"Owncloud password reset" => "Owncloud slaptažodžio atkūrimas",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nustatymai",
+"January" => "Sausis",
+"February" => "Vasaris",
+"March" => "Kovas",
+"April" => "Balandis",
+"May" => "Gegužė",
+"June" => "Birželis",
+"July" => "Liepa",
+"August" => "Rugpjūtis",
+"September" => "Rugsėjis",
+"October" => "Spalis",
+"November" => "Lapkritis",
+"December" => "Gruodis",
+"Cancel" => "Atšaukti",
+"No" => "Ne",
+"Yes" => "Taip",
+"Ok" => "Gerai",
+"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
+"Error" => "Klaida",
 "ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
@@ -34,7 +55,6 @@
 "Finish setup" => "Baigti diegimą",
 "web services under your control" => "jūsų valdomos web paslaugos",
 "Log out" => "Atsijungti",
-"Settings" => "Nustatymai",
 "Lost your password?" => "Pamiršote slaptažodį?",
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 1a363a4aed6069bbd760d6c2229c89a9296f3bc1..6435c5015872323db270dc375d2a65f132d1901c 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Settings" => "Iestatījumi",
 "Use the following link to reset your password: {link}" => "Izmantojiet šo linku lai mainītu paroli",
 "You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
 "Requested" => "Obligāts",
@@ -25,7 +26,6 @@
 "Database host" => "Datubāzes mājvieta",
 "Finish setup" => "Pabeigt uzstādījumus",
 "Log out" => "Izlogoties",
-"Settings" => "Iestatījumi",
 "Lost your password?" => "Aizmirsāt paroli?",
 "remember" => "atcerēties",
 "Log in" => "Ielogoties",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 7baac36f390ab6498f261bcc111df6eafc370a6b..af49a04f11c0e527fdbb1f416b285166edf6f189 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Име за апликацијата не е доставено.",
 "No category to add?" => "Нема категорија да се додаде?",
 "This category already exists: " => "Оваа категорија веќе постои:",
-"Owncloud password reset" => "Ресетирање на Owncloud лозинка",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Поставки",
+"January" => "Јануари",
+"February" => "Февруари",
+"March" => "Март",
+"April" => "Април",
+"May" => "Мај",
+"June" => "Јуни",
+"July" => "Јули",
+"August" => "Август",
+"September" => "Септември",
+"October" => "Октомври",
+"November" => "Ноември",
+"December" => "Декември",
+"Cancel" => "Откажи",
+"No" => "Не",
+"Yes" => "Да",
+"Ok" => "Во ред",
+"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
+"Error" => "Грешка",
 "ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Заврши го подесувањето",
 "web services under your control" => "веб сервиси под Ваша контрола",
 "Log out" => "Одјава",
-"Settings" => "Поставки",
 "Lost your password?" => "Ја заборавивте лозинката?",
 "remember" => "запамти",
 "Log in" => "Најава",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 5cf7a04b41dca104a6360ecc84530ccae6b0dd6e..25da7cd8622c1541e59e1fc5fcf486db8be7cc80 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,5 +1,28 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "Penetapan kata laluan Owncloud",
+"Application name not provided." => "nama applikasi tidak disediakan",
+"No category to add?" => "Tiada kategori untuk di tambah?",
+"This category already exists: " => "Kategori ini telah wujud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Tetapan",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Mac",
+"April" => "April",
+"May" => "Mei",
+"June" => "Jun",
+"July" => "Julai",
+"August" => "Ogos",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Disember",
+"Cancel" => "Batal",
+"No" => "Tidak",
+"Yes" => "Ya",
+"Ok" => "Ok",
+"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
+"Error" => "Ralat",
+"ownCloud password reset" => "Set semula kata lalaun ownCloud",
 "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
 "Requested" => "Meminta",
@@ -15,7 +38,9 @@
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
+"Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
+"Edit categories" => "Edit kategori",
 "Add" => "Tambah",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
 "Password" => "Kata laluan",
@@ -30,7 +55,6 @@
 "Finish setup" => "Setup selesai",
 "web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Log out" => "Log keluar",
-"Settings" => "Tetapan",
 "Lost your password?" => "Hilang kata laluan?",
 "remember" => "ingat",
 "Log in" => "Log masuk",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 80b9da0e1e984a498640f639fdcadd99c6de96e5..a8bfebb8a55b5228b93f7c2193a7fb35bcdf390b 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "Applikasjonsnavn ikke angitt.",
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
-"Owncloud password reset" => "OwnCloud passordtilbakestilling",
+"Settings" => "Innstillinger",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mars",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Desember",
+"Cancel" => "Avbryt",
+"No" => "Nei",
+"Yes" => "Ja",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Ingen kategorier merket for sletting.",
+"Error" => "Feil",
 "ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
@@ -36,7 +54,6 @@
 "Finish setup" => "Fullfør oppsetting",
 "web services under your control" => "nettjenester under din kontroll",
 "Log out" => "Logg ut",
-"Settings" => "Innstillinger",
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
 "Log in" => "Logg inn",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 0b804f4d176ec0bf72ecdc39e75afce135527a39..874a710a75928a20fc7e6dbf0d839b134ffd277c 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "Applicatie naam niet gegeven.",
 "No category to add?" => "Geen categorie toevoegen?",
 "This category already exists: " => "De categorie bestaat al.",
-"Owncloud password reset" => "Reset je ownCloud wachtwoord",
+"Settings" => "Instellingen",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Maart",
+"April" => "April",
+"May" => "Mei",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Augustus",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Annuleren",
+"No" => "Nee",
+"Yes" => "Ja",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
+"Error" => "Fout",
 "ownCloud password reset" => "ownCloud wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
@@ -36,7 +54,6 @@
 "Finish setup" => "Installatie afronden",
 "web services under your control" => "webdiensten die je beheerst",
 "Log out" => "Afmelden",
-"Settings" => "Instellingen",
 "Lost your password?" => "Uw wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index aeb805173827f03c6c1c3116595ae6d7efdf5658..9dfce36049f89fbcbb5fce3e3e474a0dca80933c 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "Owncloud Passord tilbakestilling",
+"Settings" => "Innstillingar",
 "Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
 "Requested" => "Førespurt",
@@ -29,7 +29,6 @@
 "Finish setup" => "Fullfør oppsettet",
 "web services under your control" => "Vev tjenester under din kontroll",
 "Log out" => "Logg ut",
-"Settings" => "Innstillingar",
 "Lost your password?" => "Gløymt passordet?",
 "remember" => "hugs",
 "Log in" => "Logg inn",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 3c6f28c856e95bc4cf3c971bacc6863321e36799..4eb5f1f9ae905a32a9cd20575e5664671b1a0f09 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Brak nazwy dla aplikacji",
 "No category to add?" => "Brak kategorii",
 "This category already exists: " => "Ta kategoria już istnieje",
-"Owncloud password reset" => "Resetowanie hasła",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ustawienia",
+"January" => "Styczeń",
+"February" => "Luty",
+"March" => "Marzec",
+"April" => "Kwiecień",
+"May" => "Maj",
+"June" => "Czerwiec",
+"July" => "Lipiec",
+"August" => "Sierpień",
+"September" => "Wrzesień",
+"October" => "Październik",
+"November" => "Listopad",
+"December" => "Grudzień",
+"Cancel" => "Anuluj",
+"No" => "Nie",
+"Yes" => "Tak",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.",
+"Error" => "Błąd",
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
 "Log out" => "Wylogowuje użytkownika",
-"Settings" => "Ustawienia",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "Zapamiętanie",
 "Log in" => "Zaloguj",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 6f01d666f78705144416a96a4cacc6546ccd61ab..46d601e6ebf27923b1703c3feabf2e890747cad7 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nome da aplicação não foi fornecido.",
 "No category to add?" => "Nenhuma categoria adicionada?",
 "This category already exists: " => "Essa categoria já existe",
-"Owncloud password reset" => "Mudar senha do Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Configurações",
+"January" => "Janeiro",
+"February" => "Fevereiro",
+"March" => "Março",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Junho",
+"July" => "Julho",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Dezembro",
+"Cancel" => "Cancelar",
+"No" => "Não",
+"Yes" => "Sim",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.",
+"Error" => "Erro",
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Concluir configuração",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
-"Settings" => "Configurações",
 "Lost your password?" => "Esqueçeu sua senha?",
 "remember" => "lembrete",
 "Log in" => "Log in",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 55c4c96e5c54a143935543c9be1c8fdc1e816f83..29135f0d66d5a187ae5beb46fba03994de2b75f3 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nome da aplicação não definida.",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: " => "Esta categoria já existe:",
-"Owncloud password reset" => "Redefinir palavra-chave ownCloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Definições",
+"January" => "Janeiro",
+"February" => "Fevereiro",
+"March" => "Março",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Junho",
+"July" => "Julho",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Dezembro",
+"Cancel" => "Cancelar",
+"No" => "Não",
+"Yes" => "Sim",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar",
+"Error" => "Erro",
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
@@ -36,7 +55,6 @@
 "Finish setup" => "Acabar instalação",
 "web services under your control" => "serviços web sob o seu controlo",
 "Log out" => "Sair",
-"Settings" => "Definições",
 "Lost your password?" => "Esqueceu a sua password?",
 "remember" => "lembrar",
 "Log in" => "Entrar",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index b6170d8e96fbfae61dfebb2536591c9004f798d8..484a47727dcdfb5ad283d68922cc6d30cd75ee21 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "Numele aplicație nu este furnizat.",
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: " => "Această categorie deja există:",
-"Owncloud password reset" => "Resetarea parolei ownCloud",
+"Settings" => "Configurări",
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
@@ -36,7 +36,6 @@
 "Finish setup" => "Finalizează instalarea",
 "web services under your control" => "servicii web controlate de tine",
 "Log out" => "Ieșire",
-"Settings" => "Configurări",
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "amintește",
 "Log in" => "Autentificare",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index ff86f29b26790bd2b43f441a9da158efaa67fd9e..edb55577772a7a33b1a882fbb0b7b82ebfd26abb 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Имя приложения не установлено.",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: " => "Эта категория уже существует: ",
-"Owncloud password reset" => "Сброс пароля OwnCloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Настройки",
+"January" => "Январь",
+"February" => "Февраль",
+"March" => "Март",
+"April" => "Апрель",
+"May" => "Май",
+"June" => "Июнь",
+"July" => "Июль",
+"August" => "Август",
+"September" => "Сентябрь",
+"October" => "Октябрь",
+"November" => "Ноябрь",
+"December" => "Декабрь",
+"Cancel" => "Отмена",
+"No" => "Нет",
+"Yes" => "Да",
+"Ok" => "Ок",
+"No categories selected for deletion." => "Нет категорий для удаления.",
+"Error" => "Ошибка",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Завершить установку",
 "web services under your control" => "Сетевые службы под твоим контролем",
 "Log out" => "Выйти",
-"Settings" => "Настройки",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b09b4f561151bdb6781eee8ef83e6f5bf6e8172a..b6bff1e0497507e63062206cbd4bf9e3530fb70b 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Meno aplikácie nezadané.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: " => "Táto kategória už existuje:",
-"Owncloud password reset" => "Obnova Owncloud hesla",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nastavenia",
+"January" => "Január",
+"February" => "Február",
+"March" => "Marec",
+"April" => "Apríl",
+"May" => "Máj",
+"June" => "Jún",
+"July" => "Júl",
+"August" => "August",
+"September" => "September",
+"October" => "Október",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Zrušiť",
+"No" => "Nie",
+"Yes" => "Áno",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.",
+"Error" => "Chyba",
 "ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Dokončiť inštaláciu",
 "web services under your control" => "webové služby pod vašou kontrolou",
 "Log out" => "Odhlásiť",
-"Settings" => "Nastavenia",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 5cd8498ea250890ca0cf13a51b3b4e21ca522e97..2f998c95492e0a2cd7287126d1e0b76fcd68d986 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Ime aplikacije ni bilo določeno.",
 "No category to add?" => "Ni kategorije za dodajanje?",
 "This category already exists: " => "Ta kategorija že obstaja:",
-"Owncloud password reset" => "Ponastavi ownCloud geslo",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nastavitve",
+"January" => "januar",
+"February" => "februar",
+"March" => "marec",
+"April" => "april",
+"May" => "maj",
+"June" => "junij",
+"July" => "julij",
+"August" => "avgust",
+"September" => "september",
+"October" => "oktober",
+"November" => "november",
+"December" => "december",
+"Cancel" => "Prekliči",
+"No" => "Ne",
+"Yes" => "Da",
+"Ok" => "V redu",
+"No categories selected for deletion." => "Za izbris ni bila izbrana nobena kategorija.",
+"Error" => "Napaka",
 "ownCloud password reset" => "Ponastavitev gesla ownCloud",
 "Use the following link to reset your password: {link}" => "Uporabite sledečo povezavo za ponastavitev gesla: {link}",
 "You will receive a link to reset your password via Email." => "Na e-pošto boste prejeli povezavo s katero lahko ponastavite vaše geslo.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Dokončaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
 "Log out" => "Odjava",
-"Settings" => "Nastavitve",
 "Lost your password?" => "Ste pozabili vaše geslo?",
 "remember" => "Zapomni si me",
 "Log in" => "Prijava",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 6bd6275df4b8512ac2a7acdbb631358cad91f9e9..c2f2f07640e7b284c1f4d0d0ad22c30a325f3f86 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "Ресетовање лозинке за Оунклауд",
+"Settings" => "Подешавања",
 "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
 "Requested" => "Захтевано",
@@ -29,7 +29,6 @@
 "Finish setup" => "Заврши подешавање",
 "web services under your control" => "веб сервиси под контролом",
 "Log out" => "Одјава",
-"Settings" => "Подешавања",
 "Lost your password?" => "Изгубили сте лозинку?",
 "remember" => "упамти",
 "Log in" => "Пријава",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e240de011ee6505ad69a0b87289902c55476d72b..8bc20cf1a6fda36319a4f95e5cf612e0c16d59ab 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Settings" => "Podešavanja",
 "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
 "Requested" => "Zahtevano",
 "Login failed!" => "Nesupela prijava!",
@@ -25,7 +26,6 @@
 "Database host" => "Domaćin baze",
 "Finish setup" => "Završi podešavanje",
 "Log out" => "Odjava",
-"Settings" => "Podešavanja",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "upamti",
 "You are logged out." => "Odjavljeni ste.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 7dcb0d7aac6113359acc875cdafdd009a2cc8e74..6be057768d94649fc5eb3085dfe7e4f895dc97d2 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -3,6 +3,7 @@
 "No category to add?" => "Ingen kategori att lägga till?",
 "This category already exists: " => "Denna kategori finns redan:",
 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Inställningar",
 "January" => "Januari",
 "February" => "Februari",
 "March" => "Mars",
@@ -54,7 +55,6 @@
 "Finish setup" => "Avsluta installation",
 "web services under your control" => "webbtjänster under din kontroll",
 "Log out" => "Logga ut",
-"Settings" => "Inställningar",
 "Lost your password?" => "Glömt ditt lösenord?",
 "remember" => "kom ihåg",
 "Log in" => "Logga in",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 2828381856145891aeb3c0452227c5841921ef34..8bd4d36524f19c3331adc3f0228eece89e3c4c28 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "ยังไม่ได้ตั้งชื่อแอพพลิเคชั่น",
 "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
 "This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
-"Owncloud password reset" => "เปลี่ยนรหัสผ่านใน Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "ตั้งค่า",
+"January" => "มกราคม",
+"February" => "กุมภาพันธ์",
+"March" => "มีนาคม",
+"April" => "เมษายน",
+"May" => "พฤษภาคม",
+"June" => "มิถุนายน",
+"July" => "กรกฏาคม",
+"August" => "สิงหาคม",
+"September" => "กันยายน",
+"October" => "ตุลาคม",
+"November" => "พฤศจิกายน",
+"December" => "ธันวาคม",
+"Cancel" => "ยกเลิก",
+"No" => "ไม่ตกลง",
+"Yes" => "ตกลง",
+"Ok" => "ตกลง",
+"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
+"Error" => "พบข้อผิดพลาด",
 "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -36,7 +55,6 @@
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
 "web services under your control" => "web services under your control",
 "Log out" => "ออกจากระบบ",
-"Settings" => "ตั้งค่า",
 "Lost your password?" => "ลืมรหัสผ่าน?",
 "remember" => "จำรหัสผ่าน",
 "Log in" => "เข้าสู่ระบบ",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index fc0f791d595a1639173d03bf203c940b502b757c..e2d0d9b073d2caf057d7852216ee734637db33e6 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Uygulama adı verilmedi.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: " => "Bu kategori zaten mevcut: ",
-"Owncloud password reset" => "Owncloud parola sıfırlama",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ayarlar",
+"January" => "Ocak",
+"February" => "Şubat",
+"March" => "Mart",
+"April" => "Nisan",
+"May" => "Mayıs",
+"June" => "Haziran",
+"July" => "Temmuz",
+"August" => "Ağustos",
+"September" => "Eylül",
+"October" => "Ekim",
+"November" => "Kasım",
+"December" => "Aralık",
+"Cancel" => "İptal",
+"No" => "Hayır",
+"Yes" => "Evet",
+"Ok" => "Tamam",
+"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
+"Error" => "Hata",
 "ownCloud password reset" => "ownCloud parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Kurulumu tamamla",
 "web services under your control" => "kontrolünüzdeki web servisleri",
 "Log out" => "Çıkış yap",
-"Settings" => "Ayarlar",
 "Lost your password?" => "Parolanızı mı unuttunuz?",
 "remember" => "hatırla",
 "Log in" => "Giriş yap",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 091a8c932931f4e6b2dd5c21ef049562edb6af0f..4a10a9fc74557d076a3df997b0aad80214746ba7 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Settings" => "Налаштування",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.",
 "Username" => "Ім'я користувача",
 "Your password was reset" => "Ваш пароль був скинутий",
@@ -18,7 +19,6 @@
 "Finish setup" => "Завершити налаштування",
 "web services under your control" => "веб-сервіс під вашим контролем",
 "Log out" => "Вихід",
-"Settings" => "Налаштування",
 "Lost your password?" => "Забули пароль?",
 "remember" => "запам'ятати",
 "Log in" => "Вхід"
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index b0b750303aa4109dce7c56385eb5059ec666fa23..4a4c97032fd6ee655fd73da55753a1b0791aead7 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -3,6 +3,7 @@
 "No category to add?" => "Không có danh mục được thêm?",
 "This category already exists: " => "Danh mục này đã được tạo :",
 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Cài đặt",
 "January" => "Tháng 1",
 "February" => "Tháng 2",
 "March" => "Tháng 3",
@@ -54,7 +55,6 @@
 "Finish setup" => "Cài đặt hoàn tất",
 "web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn",
 "Log out" => "Đăng xuất",
-"Settings" => "Cài đặt",
 "Lost your password?" => "Bạn quên mật khẩu ?",
 "remember" => "Nhớ",
 "Log in" => "Đăng nhập",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index e07add7cbb6170c616ecf233fc0f0d7644d95e0b..1f5216a2fffaf0a4d072d9d674d76f475ad3e3ee 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "没有提供应用程序名称。",
 "No category to add?" => "没有可添加分类?",
 "This category already exists: " => "此分类已存在: ",
-"Owncloud password reset" => "重置 Owncloud 密码",
+"Settings" => "设置",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"Cancel" => "取消",
+"No" => "否",
+"Yes" => "是",
+"Ok" => "好",
+"No categories selected for deletion." => "没有选择要删除的类别",
+"Error" => "错误",
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码:{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
@@ -36,7 +54,6 @@
 "Finish setup" => "安装完成",
 "web services under your control" => "由您掌控的网络服务",
 "Log out" => "注销",
-"Settings" => "设置",
 "Lost your password?" => "忘记密码?",
 "remember" => "记住",
 "Log in" => "登录",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index d958c6287239d565526599d09ae53a84b57fc857..37c0d8cc9d1f26f3215c901b31529fa7140e18b8 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "未提供應用程式名稱",
 "No category to add?" => "無分類添加?",
 "This category already exists: " => "此分類已經存在:",
-"Owncloud password reset" => "私有雲重設密碼",
+"Settings" => "設定",
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: (聯結) ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
@@ -36,7 +36,6 @@
 "Finish setup" => "完成設定",
 "web services under your control" => "網路服務已在你控制",
 "Log out" => "登出",
-"Settings" => "設定",
 "Lost your password?" => "忘記密碼?",
 "remember" => "記住",
 "Log in" => "登入",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index c71bea493211a8483f99fef67f96237263ef5b06..2333c2fb296b945da8ac51a6ee05aa46244281d4 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/contacts.po
@@ -7,101 +7,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: templates/index.php:13
-msgid "Add Contact"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
 msgstr ""
 
 #: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,184 +513,193 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
 msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
-msgid "Zipcode"
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
 msgstr ""
 
 #: templates/part.edit_name_dialog.php:16
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index ad5808d2ffbae2fc8f351c8e045d5ed1b1acd352..527198ed85c8d441a1b911d1d7554a93e71d2a79 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,10 +7,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.net/projects/p/owncloud/language/af/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -106,10 +114,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -239,14 +243,10 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/af/files.po b/l10n/af/files.po
index c6bfa607c96a7d720b13eef818f7e0aa84f5b452..0c8cce8a4a072b995159379692e7ebb697e9a65a 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 518656c953da06d0287eb0f85af80f9e558a37a0..2c712f76921a0ff8dbcbc49ebbdfea12f5ef268d 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\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"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "خطء خلال توقيف كتاب العناوين."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "خطء خلال اضافة معرفه جديده."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "لا يمكنك اضافه صفه خاليه."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "يجب ملء على الاقل خانه واحده من العنوان."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "خطء خلال اضافة صفة المعرفه."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "خطء خلال اضافة كتاب عناوين."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "خطء خلال تفعيل كتاب العناوين."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة."
@@ -111,231 +107,185 @@ msgstr "المعلومات الموجودة في ال vCard غير صحيحة. 
 msgid "Error deleting contact property."
 msgstr "خطء خلال محي الصفه."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "خطء خلال تعديل الصفه."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "خطء خلال تعديل كتاب العناوين"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "المعارف"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "معرفه"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "تاريخ الميلاد"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "معرفه"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "أضف شخص "
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "كتب العناوين"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "كتاب عناوين جديد"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "وصلة CardDav"
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "تعديل"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "انزال المعرفه"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "امحي المعرفه"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "تاريخ الميلاد"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "مفضل"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "الهاتف"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "انزال المعرفه"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "امحي المعرفه"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "نوع"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "العنوان البريدي"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "إضافة"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "شارع"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "المدينة"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "المنطقة"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "رقم المنطقة"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "البلد"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "أدخل"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "البلد"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 049f3ebca578d0ec50ef82fb16350a02c699def8..40dbd4406903179095e545dd16b7f72448f646d3 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/owncloud/language/ar/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "تعديلات"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "استرجاع كلمة السر"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -240,14 +244,10 @@ msgstr "انهاء التعديلات"
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "تعديلات"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 318a459be43e7aa17047b74355467cc53085bb86..1e85ee962be6f4d9662767f133244683f33fc15d 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "محذوف"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 16f62d246d32fd5e9ce2d2f112e3b473c0798194..555fd8a481f8544ccbead68b09a8ce126a2951d4 100644
--- a/l10n/ar_SA/contacts.po
+++ b/l10n/ar_SA/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\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"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 5c1cf5518c04f0336337097fff4004c6e8501758..367bc89fa5715504140746d236d8970744d7cfe1 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_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"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index ddc698c36952d7e4133001a9554f255d97a715ee..84a992f187a1b392056016867313c74fbb7a91db 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/bg_BG/bookmarks.po b/l10n/bg_BG/bookmarks.po
index 7375ecb18e71a854c42913c98efde703830a0135..b55c57ce25185855130c4ef8fb0608966f466568 100644
--- a/l10n/bg_BG/bookmarks.po
+++ b/l10n/bg_BG/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yasen Pramatarov <yasen@lindeas.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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:53+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\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"
@@ -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 "Бутон за отметки <br />"
diff --git a/l10n/bg_BG/calendar.po b/l10n/bg_BG/calendar.po
index 7edfe71490686f6d258c739b005fcf9d0ee73d3b..b07eef2d00b635bb25f2dc0f01953b463dbefe30 100644
--- a/l10n/bg_BG/calendar.po
+++ b/l10n/bg_BG/calendar.po
@@ -4,54 +4,77 @@
 # 
 # Translators:
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:51+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/categories/rescan.php:28
-msgid "No calendars found."
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
 msgstr ""
 
-#: ajax/categories/rescan.php:36
-msgid "No events found."
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
 msgstr ""
 
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr "Не са открити календари."
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr "Не са открити събития."
+
 #: ajax/event/edit.form.php:20
 msgid "Wrong calendar"
 msgstr ""
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Грешка при внасяне"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
-msgstr ""
+msgstr "Нов часови пояс:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Часовата зона е сменена"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Невалидна заявка"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календар"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
 msgstr ""
@@ -76,257 +99,338 @@ msgstr ""
 msgid "dddd, MMM d, yyyy"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
-msgstr ""
+msgstr "Роджен ден"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
-msgstr ""
+msgstr "Клиенти"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
-msgstr ""
+msgstr "Празници"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
-msgstr ""
+msgstr "Идеи"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
-msgstr ""
+msgstr "Пътуване"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
-msgstr ""
+msgstr "Среща"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
-msgstr ""
+msgstr "Друго"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
-msgstr ""
+msgstr "Лично"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
-msgstr ""
+msgstr "Проекти"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
-msgstr ""
+msgstr "Въпроси"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
+msgstr "Работа"
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
 msgstr ""
 
-#: lib/app.php:380
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr ""
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Нов календар"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не се повтаря"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Дневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Седмично"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Всеки делничен ден"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Двуседмично"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Месечно"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Годишно"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
-msgstr ""
+msgstr "никога"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr ""
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr ""
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr ""
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr ""
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
-msgstr ""
+msgstr "Понеделник"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
-msgstr ""
+msgstr "Сряда"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
-msgstr ""
+msgstr "Четвъртък"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
-msgstr ""
+msgstr "Петък"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
-msgstr ""
+msgstr "Събота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
-msgstr ""
+msgstr "Неделя"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr ""
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr ""
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr ""
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr ""
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr ""
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr ""
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr ""
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr ""
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr ""
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr ""
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr ""
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr ""
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr ""
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr ""
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr ""
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr ""
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr ""
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr ""
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr ""
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr ""
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr ""
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr ""
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr ""
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr ""
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr ""
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Всички дни"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr ""
-
 #: templates/calendar.php:13
 msgid "Missing fields"
-msgstr ""
+msgstr "Липсват полета"
 
 #: templates/calendar.php:14 templates/part.eventform.php:19
 #: templates/part.showevent.php:11
@@ -357,27 +461,27 @@ msgstr ""
 msgid "There was a database fail"
 msgstr ""
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Седмица"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Месец"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
-msgstr ""
+msgstr "Списък"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Днес"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Възникна проблем с разлистването на файла."
 
@@ -387,37 +491,37 @@ msgstr "Изберете активен календар"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
-msgstr ""
+msgstr "Вашите календари"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr ""
 
 #: templates/part.choosecalendar.php:31
 msgid "Shared calendars"
-msgstr ""
+msgstr "Споделени календари"
 
 #: templates/part.choosecalendar.php:48
 msgid "No shared calendars"
-msgstr ""
+msgstr "Няма споделени календари"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
-msgstr ""
+msgstr "Споделяне на календар"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Промяна"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
-msgstr ""
+msgstr "Изтриване"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
@@ -425,7 +529,7 @@ msgstr ""
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
-msgstr ""
+msgstr "Нов календар"
 
 #: templates/part.editcalendar.php:9
 msgid "Edit calendar"
@@ -445,7 +549,7 @@ msgstr "Цвят на календара"
 
 #: templates/part.editcalendar.php:42
 msgid "Save"
-msgstr ""
+msgstr "Запис"
 
 #: templates/part.editcalendar.php:42 templates/part.editevent.php:8
 #: templates/part.newevent.php:6
@@ -454,7 +558,7 @@ msgstr "Продължи"
 
 #: templates/part.editcalendar.php:43
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
 #: templates/part.editevent.php:1
 msgid "Edit an event"
@@ -462,7 +566,7 @@ msgstr "Промяна на събитие"
 
 #: templates/part.editevent.php:10
 msgid "Export"
-msgstr ""
+msgstr "Изнасяне"
 
 #: templates/part.eventform.php:8 templates/part.showevent.php:3
 msgid "Eventinfo"
@@ -482,7 +586,7 @@ msgstr ""
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr ""
+msgstr "Споделяне"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
@@ -494,29 +598,29 @@ msgstr "Категория"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr ""
+msgstr "Отделете категориите със запетаи"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактиране на категориите"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Целодневно събитие"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "От"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
-msgstr ""
+msgstr "Разширени настройки"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Локация"
 
@@ -524,7 +628,7 @@ msgstr "Локация"
 msgid "Location of the Event"
 msgstr "Локация"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Описание"
 
@@ -532,86 +636,88 @@ msgstr "Описание"
 msgid "Description of the Event"
 msgstr "Описание"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повтори"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr ""
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr ""
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr ""
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr ""
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr ""
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr ""
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr ""
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr ""
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr ""
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr ""
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr ""
 
-#: templates/part.import.php:1
-msgid "Import a calendar file"
-msgstr ""
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "създаване на нов календар"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:17
+msgid "Import a calendar file"
 msgstr ""
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr ""
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Изберете календар"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
-msgstr ""
+msgstr "Име на новия календар"
 
-#: templates/part.import.php:17
-msgid "Import"
+#: templates/part.import.php:44
+msgid "Take an available name!"
 msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
 msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr ""
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Внасяне"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
-msgstr ""
+msgstr "Затваряне на прозореца"
 
 #: templates/part.newevent.php:1
 msgid "Create a new event"
@@ -619,21 +725,17 @@ msgstr "Ново събитие"
 
 #: templates/part.showevent.php:1
 msgid "View an event"
-msgstr ""
+msgstr "Преглед на събитие"
 
 #: templates/part.showevent.php:23
 msgid "No categories selected"
-msgstr ""
-
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr ""
+msgstr "Няма избрани категории"
 
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr ""
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr ""
 
@@ -659,10 +761,34 @@ msgstr ""
 
 #: templates/settings.php:40
 msgid "First day of the week"
+msgstr "Първи ден на седмицата"
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
 msgstr ""
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
 msgstr ""
 
 #: templates/share.dropdown.php:20
@@ -679,7 +805,7 @@ msgstr ""
 
 #: templates/share.dropdown.php:48
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/share.dropdown.php:49
 msgid "select groups"
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index 40582ffea9f2e272b7ae27d2d0655bbbafe9135f..d3511531840cbacca29e2d66d36f009ded704f47 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/contacts.po
@@ -7,101 +7,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\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"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: templates/index.php:13
-msgid "Add Contact"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
 msgstr ""
 
 #: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,184 +513,193 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
 msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
-msgid "Zipcode"
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
 msgstr ""
 
 #: templates/part.edit_name_dialog.php:16
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 477b4f2e81786ea5e70149668428cb07a6a5158e..96d5aeb2168fb3989601a76b24a9f58c48538e22 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -6,14 +6,15 @@
 #   <adn.adin@gmail.com>, 2011.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,89 +31,93 @@ msgstr ""
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "Категорията вече съществува:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
-msgid "January"
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Настройки"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
+msgid "January"
+msgstr "Януари"
+
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Февруари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Март"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Април"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Май"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Юни"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Юли"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Август"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Септември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Октомври"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Ноември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Декември"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Добре"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Няма избрани категории за изтриване"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -179,7 +184,7 @@ msgstr "Помощ"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Достъпът е забранен"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -187,11 +192,11 @@ msgstr "облакът не намерен"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактиране на категориите"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Добавяне"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -242,14 +247,10 @@ msgstr "Завършване на настройките"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Изход"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Настройки"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Забравена парола?"
@@ -260,7 +261,7 @@ msgstr "запомни"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr ""
+msgstr "Вход"
 
 #: templates/logout.php:1
 msgid "You are logged out."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index c87744a21ddca14f132c79ead92f0f6b7237dc92..3e542a9008ba9d832d314a89423b75773b12ac01 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +47,7 @@ msgstr "Липсва временната папка"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Грешка при запис на диска"
 
 #: appinfo/app.php:6
 msgid "Files"
@@ -60,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
@@ -78,7 +99,7 @@ msgstr ""
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Грешка при качване"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
@@ -86,11 +107,11 @@ msgstr ""
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Качването е отменено."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Неправилно име – \"/\" не е позволено."
 
 #: js/files.js:631 templates/index.php:55
 msgid "Size"
@@ -102,15 +123,15 @@ msgstr "Променено"
 
 #: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "папка"
 
 #: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "папки"
 
 #: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "файл"
 
 #: js/files.js:671
 msgid "files"
@@ -138,7 +159,7 @@ msgstr ""
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 означава без ограничение"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
@@ -146,19 +167,19 @@ msgstr ""
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Нов"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Текстов файл"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "От url-адрес"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -166,7 +187,7 @@ msgstr "Качване"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Отказване на качването"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -178,7 +199,7 @@ msgstr "Име"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Споделяне"
 
 #: templates/index.php:51
 msgid "Download"
@@ -196,7 +217,7 @@ msgstr "Файловете които се опитвате да качите с
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Файловете се претърсват, изчакайте."
 
 #: templates/index.php:74
 msgid "Current scanning"
diff --git a/l10n/bg_BG/media.po b/l10n/bg_BG/media.po
index 16a6c478ec48bb84a812ba14411c574a9bb903b0..48b61366ff7ffbff83a05df0e90256ca05e40d89 100644
--- a/l10n/bg_BG/media.po
+++ b/l10n/bg_BG/media.po
@@ -4,27 +4,28 @@
 # 
 # Translators:
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.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: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/language/bg_BG/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:39+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
 msgstr "Музика"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Добавяне на албума към списъка за изпълнение"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 4b57953ba079cf0f7b68bf0578cf21924e575798..00bd674afae2ca6300a84fde810e95915954563c 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <adn.adin@gmail.com>, 2011.
 # Stefan Ilivanov <ilivanov@gmail.com>, 2011.
+# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:43+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\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"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Е-пощата е записана"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Неправилна е-поща"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -45,15 +46,15 @@ msgstr "Езика е сменен"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr ""
+msgstr "Изключване"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr ""
+msgstr "Включване"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Записване..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -93,7 +94,7 @@ msgstr "от"
 
 #: templates/help.php:8
 msgid "Documentation"
-msgstr ""
+msgstr "Документация"
 
 #: templates/help.php:9
 msgid "Managing Big Files"
@@ -129,7 +130,7 @@ msgstr ""
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Изтегляне"
 
 #: templates/personal.php:19
 msgid "Your password got changed"
@@ -157,15 +158,15 @@ msgstr "Промяна на парола"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Е-поща"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Адресът на е-пощата ви"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Въведете е-поща за възстановяване на паролата"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -173,7 +174,7 @@ msgstr "Език"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Помощ за превода"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -197,7 +198,7 @@ msgstr "Ново"
 
 #: templates/users.php:35
 msgid "Default Quota"
-msgstr ""
+msgstr "Квота по подразбиране"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
@@ -209,7 +210,7 @@ msgstr ""
 
 #: templates/users.php:82
 msgid "Quota"
-msgstr ""
+msgstr "Квота"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index 5d7e0b0fc247370cf41c7bcbe6991dd103de799f..f73ac255105705dec86fa7bbd3eacfe7e5d41410 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/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-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:18+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
 "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"
@@ -83,20 +83,20 @@ msgstr "Falta la ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Error en analitzar la ID de la VCard: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "No s'ha tramès cap ID de contacte."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Error en llegir la foto del contacte."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Error en desar el fitxer temporal."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La foto carregada no és vàlida."
 
@@ -124,31 +124,31 @@ msgstr "El fitxer no existeix:"
 msgid "Error loading image."
 msgstr "Error en carregar la imatge."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Error en obtenir l'objecte contacte."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Error en obtenir la propietat PHOTO."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Error en desar el contacte."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Error en modificar la mida de la imatge"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Error en retallar la imatge"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Error en crear la imatge temporal"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Error en trobar la imatge:"
 
@@ -180,110 +180,110 @@ msgstr "Error en actualitzar la llibreta d'adreces."
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El fitxer carregat supera la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "No s'ha pogut desar la imatge temporal: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "No s'ha pogut carregar la imatge temporal: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactes"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Aquesta funcionalitat encara no està implementada"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "No implementada"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contacte"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nou"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Contate nou"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
@@ -299,129 +299,129 @@ msgstr " importat, "
 msgid " failed."
 msgstr " fallada."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "No s'ha trobat la llibreta d'adreces."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Negocis"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Trucada"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Emissari"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idees"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Viatge"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Aniversari"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Reunió"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Preguntes"
 
@@ -429,63 +429,67 @@ msgstr "Preguntes"
 msgid "{name}'s Birthday"
 msgstr "Aniversari de {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Afegeix un contacte"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importa"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Tanca"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navegació"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Següent contacte de la llista"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contacte anterior de la llista"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Següent/anterior llibreta d'adreces"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Carrega de nou la llista de contactes"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Afegeix un contacte nou"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Esborra el contacte"
 
@@ -852,22 +856,22 @@ msgstr "Escriviu un nom"
 msgid "Enter description"
 msgstr "Escriviu una descripció"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Adreces de sincronització CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "més informació"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Adreça primària (Kontact i al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Enllaç(os) vCard només de lectura"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 361164d2ef54f588ab9b836629310cd5af7ed5aa..65b3ff158342e8644a39204b51eadec22069a69b 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/language/ca/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Aquesta categoria ja existeix:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Arranjament"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Març"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "D'acord"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "No hi ha categories per eliminar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Restableix la contrasenya d'Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
 
@@ -241,14 +245,10 @@ msgstr "Acaba la configuració"
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Arranjament"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 538b9da7fe802b302fa00ec3eaf02a2dfa6a6548..a453eb9803c209cafd0d80344f787baf03200343 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr "Deixa de compartir"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "desfés"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "esborrat"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 6c392a1f09aaf578e7f2315ff17a0eaef863b61f..2b16024e2be50c8b2d0a6fc891795d484dbd6b0c 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -10,101 +10,97 @@ 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:14+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-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"
+"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"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Chyba při (de)aktivaci adresáře."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Během přidávání kontaktu nastala chyba."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "jméno elementu není nastaveno."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id neni nastaveno."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nelze přidat prazdný údaj."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Musí být uveden nejméně jeden z adresních údajů"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Pokoušíte se přidat duplicitní atribut: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Chyba během přdávání údaje kontaktu."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadáno"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Chyba při nastavování kontrolního součtu."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Žádné kategorie nebyly vybrány k smazání."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Žádný adresář nenalezen."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Žádné kontakty nenalezeny."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Chybí ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba při parsování VCard pro ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nelze přidat adresář s prázdným jménem."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Chyba při přidávání adresáře."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Chyba při aktivaci adresáře."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nebylo nastaveno ID kontaktu."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Chyba při načítání fotky kontaktu."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Chyba při ukládání dočasného souboru."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id neni nastaveno."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
@@ -113,328 +109,391 @@ msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 msgid "Error deleting contact property."
 msgstr "Chyba při odstraňování údaje kontaktu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Chybí ID kontaktu."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Chybí id kontaktu."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Žádná fotka nebyla nahrána."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Soubor neexistuje:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Chyba při načítání obrázku."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Chyba při převzetí objektu kontakt."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Chyba při získávání fotky."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Chyba při ukládání kontaktu."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Chyba při změně velikosti obrázku."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Chyba při osekávání obrázku."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Chyba při vytváření dočasného obrázku."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "jméno elementu není nastaveno."
+msgstr "Chyba při hledání obrázku:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrolní součet není nastaven."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informace o vCard je nesprávná. Obnovte stránku, prosím."
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Něco se pokazilo. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nelze aktualizovat adresář s prázdným jménem."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Chyba při aktualizaci adresáře."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba při nahrávání kontaktů do úložiště."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Nahrávaný soubor se nahrál pouze z části"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl nahrán"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Chybí dočasný adresář"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Nemohu uložit dočasný obrázek: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Nemohu načíst dočasný obrázek: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Soubor nebyl odeslán. Neznámá chyba"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Bohužel, tato funkce nebyla ještě implementována."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Neimplementováno"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Nelze získat platnou adresu."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Tento parametr nemuže zůstat nevyplněn."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Upravit jméno"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Pro import kontaktů sem přetáhněte soubor VCF"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Vybrat typ"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Výsledek: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "importováno v pořádku,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "neimportováno."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresář nenalezen."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Narozeniny"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Narozeniny {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Přidat kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresáře"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zavřít"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Nastavit adresáře"
@@ -443,11 +502,7 @@ msgstr "Nastavit adresáře"
 msgid "New Address Book"
 msgstr "Nový adresář"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importovat z VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav odkaz"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Editovat"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Odstranit"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Stáhnout kontakt"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Přetáhněte sem fotku pro její nahrání"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Odstranit kontakt"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Smazat současnou fotku"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Přetáhněte sem fotku pro její nahrání"
+msgid "Edit current photo"
+msgstr "Upravit současnou fotku"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Nahrát novou fotku"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Vybrat fotku z ownCloudu"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Upravit podrobnosti jména"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Zadejte přezdívku"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Narozeniny"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Oddělte skupiny čárkami"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Upravit skupiny"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferovaný"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Prosím zadejte platnou e-mailovou adresu"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Zadat e-mailovou adresu"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Odeslat na adresu"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Smazat e-mail"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Zadat telefoní číslo"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Smazat telefoní číslo"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Upravit podrobnosti adresy"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Zde můžete připsat poznámky."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Přidat políčko"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilová fotka"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Smazat současnou fotku"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Upravit současnou fotku"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Nahrát novou fotku"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Stáhnout kontakt"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Vybrat fotku z ownCloudu"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Odstranit kontakt"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Obrázek byl odstraněn z dočasné paměti."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Upravit adresu"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "PO box"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Rozšířené"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulice"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Město"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Kraj"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "PSČ"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Země"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Upravit kategorie"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Přidat"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresář"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Potvrdit"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Storno"
 
@@ -766,33 +829,10 @@ msgstr "vytvořit nový adresář"
 msgid "Name of new addressbook"
 msgstr "Jméno nového adresáře"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importování kontaktů"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vyberte adresář do kterého chcete importovat:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vybrat z disku"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žádné kontakty v adresáři."
@@ -805,18 +845,34 @@ msgstr "Přidat kontakt"
 msgid "Configure addressbooks"
 msgstr "Nastavit adresář"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Adresa pro synchronizaci pomocí CardDAV:"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "víc informací"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Hlavní adresa (Kontakt etc)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 594e0635dcacd0f0273fe66b9b6447dcde14b7b5..bfc8ad14e392898ff963a8d2a9b0dd5bd172ce8b 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -10,10 +10,10 @@ 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:14+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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Tato kategorie již existuje:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Nastavení"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Leden"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Únor"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Březen"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Duben"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Květen"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Červen"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Červenec"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Srpen"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Září"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Říjen"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Prosinec"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ano"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Budiž"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Žádné kategorie nebyly vybrány ke smazání."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reset hesla Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reset hesla pro ownCloud"
 
@@ -242,14 +246,10 @@ msgstr "Dokončit instalaci"
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nastavení"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Zapomenuté heslo?"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 8ba79199e829139c822458ff0f4945a0e6e94cec..b168a2b7e1e58f1d7c6c3fce71def47ae852d261 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Vymazat"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generuji ZIP soubor, může to chvíli trvat"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index be2ce3917fc77fb825a7319b7ed800f2df812607..d6f33b75f3e2657e8232758e18ba7b33e876c111 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.po
@@ -7,105 +7,102 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Fejl ved (de)aktivering af adressebogen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "Elementnavnet er ikke medsendt."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "Intet ID medsendt."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan ikke tilføje en egenskab uden indhold."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Der skal udfyldes mindst et adressefelt."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Kan ikke tilføje overlappende element."
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Fejl ved tilføjelse af egenskab."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Intet ID medsendt"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Kunne ikke sætte checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Der ikke valgt nogle grupper at slette."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Der blev ikke fundet nogen adressebøger."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Der blev ikke fundet nogen kontaktpersoner."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Manglende ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr "Kunne ikke indlæse VCard med ID'en: \""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan ikke tilføje adressebog uden et navn."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Fejl ved tilføjelse af adressebog."
+msgstr "Kunne ikke indlæse VCard med ID'et: \""
 
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Fejl ved aktivering af adressebog."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Ingen ID for kontakperson medsendt."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Kunne ikke indlæse foto for kontakperson."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Kunne ikke gemme midlertidig fil."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Billedet under indlæsning er ikke gyldigt."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "Intet ID medsendt."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informationen om vCard er forkert. Genindlæs siden."
@@ -114,328 +111,391 @@ msgstr "Informationen om vCard er forkert. Genindlæs siden."
 msgid "Error deleting contact property."
 msgstr "Fejl ved sletning af egenskab for kontaktperson."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktperson ID mangler."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Kontaktperson ID mangler."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Der blev ikke medsendt en sti til fotoet."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Filen eksisterer ikke:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Kunne ikke indlæse billede."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fejl ved indlæsning af kontaktpersonobjektet."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fejl ved indlæsning af PHOTO feltet."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Kunne ikke gemme kontaktpersonen."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Kunne ikke ændre billedets størrelse"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Kunne ikke beskære billedet"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Kunne ikke oprette midlertidigt billede"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Kunne ikke finde billedet: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "Element navnet er ikke medsendt."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "Checksum er ikke medsendt."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Noget gik grueligt galt. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan ikke opdatére adressebogen med et tomt navn."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Fejl ved opdatering af adressebog"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ingen fil uploadet"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manglende midlertidig mappe."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Kunne ikke gemme midlertidigt billede: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Kunne ikke indlæse midlertidigt billede"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Denne funktion er desværre ikke implementeret endnu"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Ikke implementeret"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Kunne ikke finde en gyldig adresse."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Fejl"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktperson"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Dette felt må ikke være tomt."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Rediger navn"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Dr."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Drop en VCF fil for at importere kontaktpersoner."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Vælg type"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultat:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " importeret "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " fejl."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adressebogen blev ikke fundet."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Besked"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Personsøger"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "{name}'s fødselsdag"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Fødselsdag"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontaktperson"
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}s fødselsdag"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tilføj kontaktperson"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressebøger"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Luk"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfigurer adressebøger"
@@ -444,11 +504,7 @@ msgstr "Konfigurer adressebøger"
 msgid "New Address Book"
 msgstr "Ny adressebog"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importer fra VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav-link"
@@ -462,186 +518,195 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Download kontaktperson"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Drop foto for at uploade"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Slet kontaktperson"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Slet nuværende foto"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Drop foto for at uploade"
+msgid "Edit current photo"
+msgstr "Rediger nuværende foto"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Upload nyt foto"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Vælg foto fra ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Rediger navnedetaljer."
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr "Øgenavn"
+msgstr "Kaldenavn"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
-msgstr "Indtast øgenavn"
+msgstr "Indtast kaldenavn"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Fødselsdag"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Opdel gruppenavne med kommaer"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Rediger grupper"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Foretrukken"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Indtast venligst en gyldig email-adresse."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Indtast email-adresse"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Send mail til adresse"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Slet email-adresse"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Indtast telefonnummer"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Slet telefonnummer"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Rediger adresse detaljer"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Tilføj noter her."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr "Tilfæj element"
+msgstr "Tilføj element"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilbillede"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Slet nuværende foto"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Rediger nuværende foto"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Upload nyt foto"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Download kontaktperson"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Vælg foto fra ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Slet kontaktperson"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Det midlertidige billede er ikke længere tilgængeligt."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Rediger adresse"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Udvidet"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Vej"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "By"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Rediger grupper"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Tilføj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressebog"
@@ -672,7 +737,7 @@ msgstr "Fru"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr "Dr"
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -747,7 +812,6 @@ msgid "Submit"
 msgstr "Gem"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -767,33 +831,10 @@ msgstr "Opret ny adressebog"
 msgid "Name of new addressbook"
 msgstr "Navn på ny adressebog"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importerer kontaktpersoner"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vælg hvilken adressebog, der skal importeres til:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vælg fra harddisk."
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontaktpersoner i din adressebog."
@@ -806,18 +847,34 @@ msgstr "Tilføj kontaktpeson."
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøger"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synkroniserings adresse"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mere info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Primær adresse (Kontak m. fl.)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 045cd429153591de3af9c26872a939928a0685ae..324afe6129d72728f142f9cc1f29bb3bf77386a7 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,14 +7,15 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 # Thomas Tanghus <>, 2012.
+# Thomas Tanghus <thomas@tanghus.net>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/language/da/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,85 +36,89 @@ msgstr "Denne kategori eksisterer allerede: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marts"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Fortryd"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nej"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ingen kategorier valgt"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fejl"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Nulstil adgangskode til Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
@@ -243,14 +248,10 @@ msgstr "Afslut opsætning"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Indstillinger"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index fdf9ce4e679888721a97559ff5b23dbb823520f0..aef6a95763ceacf319bd60618715e962a4f74a7b 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Slet"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "genererer ZIP-fil, det kan tage lidt tid."
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index e91d917df724a81fcf59dedfbf917d841177aa81..62fdc325659e910ee54af9c7e97ec0f25fd7e0aa 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 18:13+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\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"
 "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"
@@ -96,20 +96,20 @@ msgstr "Fehlende ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Fehler beim Einlesen der VCard für die ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Es wurde keine Kontakt-ID übermittelt."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Fehler beim Auslesen des Kontaktfotos."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Fehler beim Speichern der temporären Datei."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Das Kontaktfoto ist fehlerhaft."
 
@@ -137,31 +137,31 @@ msgstr "Datei existiert nicht: "
 msgid "Error loading image."
 msgstr "Fehler beim Laden des Bildes."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Fehler beim Abruf des Kontakt-Objektes."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Fehler beim Abrufen der PHOTO Eigenschaft."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Fehler beim Speichern des Kontaktes"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Fehler bei der Größenänderung des Bildes"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Fehler beim Zuschneiden des Bildes"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Fehler beim erstellen des temporären Bildes"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Fehler beim Suchen des Bildes: "
 
@@ -193,110 +193,110 @@ msgstr "Adressbuch aktualisieren fehlgeschlagen"
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Alles bestens, Datei erfolgreich übertragen."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datei konnte nur teilweise übertragen werden"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Konnte das temporäre Bild nicht speichern:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Konnte das temporäre Bild nicht laden:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Nicht Verfügbar"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Neu"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht Leer sein."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Wähle Typ"
 
@@ -312,129 +312,129 @@ msgstr " importiert, "
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adressbuch nicht gefunden."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Andere"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Fragen"
 
@@ -442,63 +442,67 @@ msgstr "Fragen"
 msgid "{name}'s Birthday"
 msgstr "Geburtstag von {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importieren"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Schließen"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Nächster Kontakt aus der Liste"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Vorheriger Kontakt aus der Liste"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Ausklappen/Einklappen des Adressbuches"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Nächstes/Vorhergehendes Adressbuch"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Kontaktliste neu laden"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Aktuellen Kontakt löschen"
 
@@ -865,22 +869,22 @@ msgstr "Name eingeben"
 msgid "Enter description"
 msgstr "Beschreibung eingeben"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV Sync-Adressen"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mehr Info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "primäre Adresse (für Kontact o.ä. Programme)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 9d8ff1066cf0f65554af315b7a835c95da859021..d2ab1e7a26e9137e084c3722dabc81a564eab1dc 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 18:47+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
@@ -41,51 +41,59 @@ msgstr "Kategorie existiert bereits:"
 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:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr "März"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr "April"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr "August"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr "September"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr "November"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr "Dezember"
 
@@ -247,10 +255,6 @@ msgstr "web services under your control"
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 61d7972e88d07e15136bb812efc861fdbd366ce4..e79d129b3457a5a5a5be13f70da479332b2fd004 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -67,14 +67,34 @@ msgstr "Nicht mehr teilen"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "rückgängig machen"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "gelöscht"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 9d72a185a0de66d6589e504d2353072714144df2..59ca23304ea0b4a260db12718414503a3f9fb5c3 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/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-07-29 02:03+0200\n"
-"PO-Revision-Date: 2012-07-28 11:43+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\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"
 "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"
@@ -87,20 +87,20 @@ msgstr "Λείπει ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Σφάλμα κατά την ανάγνωση του VCard για το ID:\""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Δε υπεβλήθει ID επαφής"
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Σφάλμα ανάγνωσης εικόνας επαφής"
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Σφάλμα αποθήκευσης προσωρινού αρχείου"
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Η φορτωμένη φωτογραφία δεν είναι έγκυρη"
 
@@ -128,31 +128,31 @@ msgstr "Το αρχείο δεν υπάρχει:"
 msgid "Error loading image."
 msgstr "Σφάλμα φόρτωσης εικόνας"
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Σφάλμα κατά τη λήψη αντικειμένου επαφής"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Σφάλμα κατά την αποθήκευση επαφής."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Σφάλμα κατά την αλλαγή μεγέθους εικόνας"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Σφάλμα κατά την περικοπή εικόνας"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Σφάλμα κατά την δημιουργία προσωρινής εικόνας"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Σφάλμα κατά την εύρεση της εικόνας: "
 
@@ -184,110 +184,110 @@ msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.
 msgid "Error uploading contacts to storage."
 msgstr "Σφάλμα κατά την αποθήκευση επαφών"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία "
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο ανέβηκε μερικώς"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Δεν ανέβηκε κάποιο αρχείο"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Δεν έχει υλοποιηθεί"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Αδυναμία λήψης έγκυρης διεύθυνσης"
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Επαφή"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Νέο"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Νέα επαφή"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
@@ -303,129 +303,129 @@ msgstr " εισάγεται,"
 msgid " failed."
 msgstr " απέτυχε."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Επιχείρηση"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Κάλεσε"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Προμηθευτής"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Ιωβηλαίο"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
@@ -433,63 +433,67 @@ msgstr "Ερωτήσεις"
 msgid "{name}'s Birthday"
 msgstr "{name} έχει Γενέθλια"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Προσθήκη επαφής"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Βιβλία διευθύνσεων"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Κλείσιμο  "
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Συντομεύσεις πλητρολογίου"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Επόμενη επαφή στη λίστα"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Προηγούμενη επαφή στη λίστα"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Ανανέωσε τη λίστα επαφών"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Προσθήκη νέου βιβλίου επαφών"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Διαγραφή τρέχουσας επαφής"
 
@@ -856,22 +860,22 @@ msgstr "Εισαγωγή ονόματος"
 msgid "Enter description"
 msgstr "Εισαγωγή περιγραφής"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "συγχρονισμός διευθύνσεων μέσω CardDAV "
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "περισσότερες πληροφορίες"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Κύρια διεύθυνση"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index c383ae1a885de67b91675df454d9e992cb16608c..97808b122bb4e08d6cfe052e71143e4141ccf7da 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
@@ -10,10 +11,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +35,89 @@ msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Ιανουάριος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Φεβρουάριος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Μάρτιος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Απρίλιος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Μάϊος"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Ιούνιος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Ιούλιος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Αύγουστος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Σεπτέμβριος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Οκτώβριος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Νοέμβριος"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Δεκέμβριος"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Ακύρωση"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Όχι"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ναι"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Οκ"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Δεν επιλέχτηκαν κατηγορίες για διαγραφή"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Σφάλμα"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Επανέκδοση κωδικού για το Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Επαναφορά κωδικού ownCloud"
 
@@ -242,14 +247,10 @@ msgstr "Ολοκλήρωση εγκατάστασης"
 msgid "web services under your control"
 msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ξεχάσατε τον κωδικό σας;"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 77eeadf487a518bd33a7bfcbab4ff68248684aef..dcbe78cd0af7ed2968cb63e72721cd284308c6d2 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr "Ακύρωση Διαμοιρασμού"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index 7b4b003e48472977c880a7bcbbb92e2b6cae18d3..b040e06d2c4b71beaa13824da28baa762697d627 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/contacts.po
@@ -8,101 +8,97 @@ 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:14+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-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"
+"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"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Eraro dum (mal)aktivigo de adresaro."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Eraro okazis dum aldono de kontakto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "eronomo ne agordiĝis."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "identigilo ne agordiĝis."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Ne eblas aldoni malplenan propraĵon."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Almenaŭ unu el la adreskampoj necesas pleniĝi."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Provante aldoni duobligitan propraĵon:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Eraro dum aldono de kontaktopropraĵo."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Neniu identigilo proviziĝis."
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Eraro dum agordado de kontrolsumo."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Neniu kategorio elektiĝis por forigi."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Neniu adresaro troviĝis."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Neniu kontakto troviĝis."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Mankas identigilo"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Eraro dum analizo de VCard por identigilo:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Ne eblas aldoni adresaron kun malplena nomo."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Eraro dum aldono de adresaro."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Eraro dum aktivigo de adresaro."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Neniu kontaktidentigilo sendiĝis."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Eraro dum lego de kontakta foto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Eraro dum konservado de provizora dosiero."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La alŝutata foto ne validas."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "identigilo ne agordiĝis."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
@@ -111,328 +107,391 @@ msgstr "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon."
 msgid "Error deleting contact property."
 msgstr "Eraro dum forigo de kontaktopropraĵo."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktidentigilo mankas."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Mankas kontaktidentigilo."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Neniu vojo al foto sendiĝis."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Dosiero ne ekzistas:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Eraro dum ŝargado de bildo."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Eraro dum ekhaviĝis kontakta objekto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Eraro dum ekhaviĝis la propraĵon PHOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Eraro dum konserviĝis kontakto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Eraro dum aligrandiĝis bildo"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Eraro dum stuciĝis bildo."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Eraro dum kreiĝis provizora bildo."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "eronomo ne agordiĝis."
+msgstr "Eraro dum serĉo de bildo: "
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrolsumo ne agordiĝis."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Io FUBAR-is."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Eraro dum ĝisdatigo de adresaro."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Eraro dum alŝutiĝis kontaktoj al konservejo."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ne eblis konservi provizoran bildon: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ne eblis ŝargi provizoran bildon: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Ne disponebla"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Ne eblis ekhavi validan adreson."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Eraro"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakto"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Redakti nomon"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Demetu VCF-dosieron por enporti kontaktojn."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Elektu tipon"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Rezulto: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " enportoj, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "malsukcesoj."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresaro ne troviĝis."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Interreto"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Naskiĝotago"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Naskiĝtago de {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakto"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aldoni kontakton"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Enporti"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresaroj"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Fermi"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Agordi adresarojn"
@@ -441,11 +500,7 @@ msgstr "Agordi adresarojn"
 msgid "New Address Book"
 msgstr "Nova adresaro"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Enporti el VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav-ligilo"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "Redakti"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Elŝuti kontakton"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Demeti foton por alŝuti"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Forigi kontakton"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Forigi nunan foton"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Demeti foton por alŝuti"
+msgid "Edit current photo"
+msgstr "Redakti nunan foton"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Alŝuti novan foton"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Elekti foton el ownCloud"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Redakti detalojn de nomo"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Enigu kromnomon"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Naskiĝotago"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Disigi grupojn per komoj"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Redakti grupojn"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferata"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Bonvolu specifi validan retpoŝtadreson."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Enigi retpoŝtadreson"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Retpoŝtmesaĝo al adreso"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Forigi retpoŝþadreson"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Enigi telefonnumeron"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Forigi telefonnumeron"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vidi en mapo"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Redakti detalojn de adreso"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Aldoni notojn ĉi tie."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Aldoni kampon"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profila bildo"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Noto"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Forigi nunan foton"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Redakti nunan foton"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Alŝuti novan foton"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Elŝuti kontakton"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Elekti foton el ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Forigi kontakton"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "La provizora bildo estas forigita de la kaŝmemoro."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Redakti adreson"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Abonkesto"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Etendita"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Strato"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Urbo"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regiono"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poŝtokodo"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Lando"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Redakti kategoriojn"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Aldoni"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresaro"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Sendi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -764,33 +827,10 @@ msgstr "krei novan adresaron"
 msgid "Name of new addressbook"
 msgstr "Nomo de nova adresaro"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Enporti"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Enportante kontaktojn"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Elektu adresaron kien enporti:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Elekti el malmoldisko"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Vi ne havas kontaktojn en via adresaro"
@@ -803,18 +843,34 @@ msgstr "Aldoni kontakton"
 msgid "Configure addressbooks"
 msgstr "Agordi adresarojn"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "adresoj por CardDAV-sinkronigo"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "pli da informo"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 4adb4f254f6450017d39264a851eb2118fb0231f..88e04e3e1021dbfacd7afb3845867040e003797f 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,10 +9,10 @@ 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:14+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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,99 +21,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nomo de aplikaĵo ne proviziiĝis."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Ĉu neniu kategorio estas aldonota?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "Ĉi tiu kategorio jam ekzistas: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Agordo"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januaro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februaro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marto"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Aprilo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Majo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Aŭgusto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktobro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Decembro"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Nuligi"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Jes"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Akcepti"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Neniu kategorio elektiĝis por forigo."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Eraro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "La pasvorto de Owncloud estas restarigita"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "La pasvorto de ownCloud restariĝis."
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -178,7 +182,7 @@ msgstr "Helpo"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Aliro estas malpermesata"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -186,11 +190,11 @@ msgstr "La nubo ne estas trovita"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Redakti kategoriojn"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Aldoni"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
@@ -241,14 +245,10 @@ msgstr "Fini la instalon"
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Agordo"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index fa37219fcc47501705d51c60fca8339890cf9d19..365883ce5a25d38fec554584d459de38ad313fcd 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index ec82648c8b60f9c5900c73c97f538bcae1e4e2ca..cecb721b9aad62625c9fb83946779b7f5f6ef882 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.po
@@ -6,106 +6,103 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+#   <rodrigo.calvo@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Error al (des)activar libreta de direcciones."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Se ha producido un error al añadir el contacto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "no se ha puesto ningún nombre de elemento."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "no se ha puesto ninguna ID."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "No se puede añadir una propiedad vacía."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Al menos uno de los campos de direcciones se tiene que rellenar."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Intentando añadir una propiedad duplicada: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Error al añadir una propiedad del contacto."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No se ha proporcionado una ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Error al establecer la suma de verificación."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "No se seleccionaron categorías para borrar."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "No se encontraron libretas de direcciones."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "No se encontraron contactos."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Falta la ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Error al analizar el VCard para la ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "No se puede añadir una libreta de direcciones sin nombre"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Error al añadir la libreta de direcciones."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Error al activar la libreta de direcciones."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "No se ha mandado ninguna ID de contacto."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Error leyendo fotografía del contacto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Error al guardar archivo temporal."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La foto que se estaba cargando no es válida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "no se ha puesto ninguna ID."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página."
@@ -114,328 +111,391 @@ msgstr "La información sobre el vCard es incorrecta. Por favor vuelve a cargar
 msgid "Error deleting contact property."
 msgstr "Error al borrar una propiedad del contacto."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta la ID del contacto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Falta la id del contacto."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "No se ha introducido la ruta de la foto."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Archivo inexistente:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Error cargando imagen."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fallo al coger el contacto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fallo al coger las propiedades de la foto ."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Fallo al salvar un contacto"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Fallo al cambiar de tamaño una foto"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Fallo al cortar el tamaño de la foto"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Fallo al crear la foto temporal"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "no se ha puesto ningún nombre de elemento."
+msgstr "Fallo al encontrar la imagen"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "no se ha puesto ninguna suma de comprobación."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "La información sobre la vCard es incorrecta. Por favor, recarga la página:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Plof. Algo ha fallado."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "No se puede actualizar una libreta de direcciones sin nombre."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Error al actualizar la libreta de direcciones."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo se ha subido parcialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "No se ha subido ningún archivo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Fallo no pudo salvar a una imagen temporal"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Fallo no pudo cargara de una imagen temporal"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Fallo no se subió el fichero"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Perdón esta función no esta aún implementada"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "No esta implementada"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Fallo : no hay dirección valida"
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Fallo"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Este campo no puede estar vacío."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Edita el Nombre"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Suelta un archivo VCF para importar contactos."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Selecciona el tipo"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultado :"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "Importado."
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "Fallo."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Libreta de direcciones no encontrada."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Localizador"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Cumpleaños de {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contacto"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Añadir contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Libretas de direcciones"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Cierra."
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configurar libretas de direcciones"
@@ -444,11 +504,7 @@ msgstr "Configurar libretas de direcciones"
 msgid "New Address Book"
 msgstr "Nueva libreta de direcciones"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importar desde VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Enlace CardDav"
@@ -462,186 +518,195 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Descargar contacto"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Suelta una foto para subirla"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Eliminar contacto"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Eliminar fotografía actual"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Suelta una foto para subirla"
+msgid "Edit current photo"
+msgstr "Editar fotografía actual"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Subir nueva fotografía"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Seleccionar fotografía desde ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar los detalles del nombre"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Alias"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introduce un alias"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Cumpleaños"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separa los grupos con comas"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor especifica una dirección de correo electrónico válida."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introduce una dirección de correo electrónico"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Enviar por correo a la dirección"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Eliminar dirección de correo electrónico"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Introduce un número de teléfono"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Eliminar número de teléfono"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar detalles de la dirección"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Añade notas aquí."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Añadir campo"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Foto del perfil"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Eliminar fotografía actual"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Editar fotografía actual"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Subir nueva fotografía"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Descargar contacto"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Seleccionar fotografía desde ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Eliminar contacto"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "La foto temporal se ha borrado del cache."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editar dirección"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Código postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extendido"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Calle"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Ciudad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Región"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Código postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorías"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Añadir"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
@@ -747,7 +812,6 @@ msgid "Submit"
 msgstr "Aceptar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -767,33 +831,10 @@ msgstr "crear una nueva agenda"
 msgid "Name of new addressbook"
 msgstr "Nombre de la nueva agenda"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selecciona una agenda para importar a:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Seleccionar del disco duro"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "No hay contactos en tu agenda."
@@ -806,18 +847,34 @@ msgstr "Añadir contacto"
 msgid "Configure addressbooks"
 msgstr "Configurar agenda"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Sincronizando direcciones"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "más información"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Dirección primaria (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 1e802ebc93c78de289535b4b85f1402be77a1036..e55ee419584ff49257467579de6d24381b466348 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,16 +6,17 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+#   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/language/es/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,85 +37,89 @@ msgstr "Esta categoría ya existe: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Ajustes"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Vale"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "No hay categorias seleccionadas para borrar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fallo"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Restablecer contraseña de ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reiniciar contraseña de ownCloud"
 
@@ -244,14 +249,10 @@ msgstr "Completar la instalación"
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ajustes"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "¿Has perdido tu contraseña?"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 6de4ca7f5637d846cfec3944bcb07e12582c3dd1..642d976601598a969bd297b2e077044b3e9fe2c7 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr "No compartir"
 msgid "Delete"
 msgstr "Eliminado"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "deshacer"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "borrado"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generando un fichero ZIP, puede llevar un tiempo."
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 870f4ec14161f08fbf3243ed8238f155e3bb9d44..a8931cbabc67caae33944bfde23d0a4d81f055cd 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.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-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 05:46+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,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Ajustes"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Aplicaciones"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administración"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "La descarga en ZIP está desactivada."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Los archivos deben ser descargados uno por uno."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Volver a Archivos"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "La aplicación no está habilitada"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Error de autenticación"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token expirado. Por favor, recarga la página."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "hace segundos"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "hace 1 minuto"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "hace %d minutos"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "hoy"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "ayer"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "hace %d días"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "este mes"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "hace meses"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "este año"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "hace años"
diff --git a/l10n/et_EE/bookmarks.po b/l10n/et_EE/bookmarks.po
index 0370bec552a0d18c8dcfde033d91d70391409d01..91cf36ab0d43188b5aee97de3ed6bd90acf9369c 100644
--- a/l10n/et_EE/bookmarks.po
+++ b/l10n/et_EE/bookmarks.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-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 10:22+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 ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Järjehoidjad"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "nimetu"
 
 #: templates/bookmarklet.php:5
 msgid ""
@@ -33,27 +34,27 @@ msgstr ""
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Loe hiljem"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Aadress"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Pealkiri"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Sildid"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Salvesta järjehoidja"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Sul pole järjehoidjaid"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index c78d9e4307f04a7e05535bc663b78a77aec774bb..41ce51e36ac27ecd5d117955e45fdb2cca36fff8 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Viga aadressiraamatu (de)aktiveerimisel."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Konktakti lisamisel tekkis viga."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "elemendi nime pole määratud."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID on määramata."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Tühja omadust ei saa lisada."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Vähemalt üks aadressiväljadest peab olema täidetud."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Proovitakse lisada topeltomadust: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Viga konktakti korralikul lisamisel."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID-d pole sisestatud"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Viga kontrollsumma määramisel."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Kustutamiseks pole valitud ühtegi kategooriat."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ei leitud ühtegi aadressiraamatut."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ühtegi kontakti ei leitud."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Puudub ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Viga VCard-ist ID parsimisel: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Tühja nimega aadressiraamatut ei saa lisada."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Viga aadressiraamatu lisamisel."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Viga aadressiraamatu aktiveerimisel."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Kontakti ID-d pole sisestatud."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Viga kontakti foto lugemisel."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Viga ajutise faili salvestamisel."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Laetav pilt pole korrektne pildifail."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID on määramata."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
@@ -111,328 +107,391 @@ msgstr "Visiitkaardi info pole korrektne. Palun lae leht uuesti."
 msgid "Error deleting contact property."
 msgstr "Viga konktaki korralikul kustutamisel."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontakti ID puudub."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Puuduv kontakti ID."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Foto asukohta pole määratud."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Faili pole olemas:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Viga pildi laadimisel."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Viga kontakti objekti hankimisel."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Viga PHOTO omaduse hankimisel."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Viga kontakti salvestamisel."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Viga pildi suuruse muutmisel"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Viga pildi lõikamisel"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Viga ajutise pildi loomisel"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "elemendi nime pole määratud."
+msgstr "Viga pildi leidmisel: "
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "kontrollsummat pole määratud."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard info pole korrektne. Palun lae lehekülg uuesti: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Midagi läks tõsiselt metsa."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Viga aadressiraamatu uuendamisel."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ajutise pildi salvestamine ebaõnnestus: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ajutise pildi laadimine ebaõnnestus: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Vabandust, aga see funktsioon pole veel valmis"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Pole implementeeritud"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Kehtiva aadressi hankimine ebaõnnestus"
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Viga"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Muuda nime"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Lohista siia VCF-fail, millest kontakte importida."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Vali tüüp"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Tulemus: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " imporditud, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " ebaõnnestus."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Aadressiraamatut ei leitud"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Sünnipäev"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name} sünnipäev"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisa kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Impordi"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Aadressiraamatud"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Sule"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Seadista aadressiraamatut"
@@ -441,11 +500,7 @@ msgstr "Seadista aadressiraamatut"
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Impordi VCF-ist"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav link"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "Muuda"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Lae kontakt alla"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Lohista üleslaetav foto siia"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kustuta kontakt"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Kustuta praegune foto"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Lohista üleslaetav foto siia"
+msgid "Edit current photo"
+msgstr "Muuda praegust pilti"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Lae üles uus foto"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Vali foto ownCloudist"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Muuda nime üksikasju"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Sisesta hüüdnimi"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Sünnipäev"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Eralda grupid komadega"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Muuda gruppe"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Eelistatud"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Palun sisesta korrektne e-posti aadress."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Sisesta e-posti aadress"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Kiri aadressile"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Kustuta e-posti aadress"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Sisesta telefoninumber"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Kustuta telefoninumber"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vaata kaardil"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Muuda aaressi infot"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Lisa märkmed siia."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Lisa väli"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profiili pilt"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Märkus"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Kustuta praegune foto"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Muuda praegust pilti"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Lae üles uus foto"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Lae kontakt alla"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Vali foto ownCloudist"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kustuta kontakt"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Ajutine pilt on puhvrist eemaldatud."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Muuda aadressi"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tüüp"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postkontori postkast"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Laiendatud"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Tänav"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Linn"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Piirkond"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postiindeks"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Riik"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Muuda kategooriat"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Lisa"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Aadressiraamat"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Saada"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -764,33 +827,10 @@ msgstr "loo uus aadressiraamat"
 msgid "Name of new addressbook"
 msgstr "Uue aadressiraamatu nimi"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Impordi"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kontaktide importimine"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Vali aadressiraamat, millesse importida:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Vali kõvakettalt"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Sinu aadressiraamatus pole ühtegi kontakti."
@@ -803,18 +843,34 @@ msgstr "Lisa kontakt"
 msgid "Configure addressbooks"
 msgstr "Seadista aadressiraamatuid"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV sünkroniseerimise aadressid"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "lisainfo"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Peamine aadress"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 7ef405993432602b94a1cd7af23b52b88dfb1c87..a98c7fc27680c36e6ac857ec4bb06b193bd0b04b 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/owncloud/language/et_EE/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +32,89 @@ msgstr "See kategooria on juba olemas: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Seaded"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Jaanuar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Veebruar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Märts"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Aprill"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juuni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juuli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktoober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Detsember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Loobu"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Jah"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Kustutamiseks pole kategooriat valitud."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Viga"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud parooli taastamine"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
 
@@ -240,14 +244,10 @@ msgstr "Lõpeta seadistamine"
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Seaded"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 99d68cbc013527a1e9969c471c407c3c3d23ebff..3c6cb58d64028256e93125d6abd683d1628bd10e 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-faili loomine, see võib veidi aega võtta."
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index c170dc40f972692abda6ed4569fc8521292215bd..323ca1311493f505763c94c6d6fa1b47ca40b6ee 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.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-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 10:25+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,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Abiinfo"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Isiklik"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Seaded"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Kasutajad"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Rakendused"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Failid tuleb alla laadida ükshaaval."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Tagasi failide juurde"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Rakendus pole sisse lülitatud"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentimise viga"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Kontrollkood aegus. Paelun lae leht uuesti."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekundit tagasi"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minut tagasi"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minutit tagasi"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "täna"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "eile"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d päeva tagasi"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "eelmisel kuul"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "kuud tagasi"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "eelmisel aastal"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "aastat tagasi"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index 1009fa2d0600957618ffc1bcca1c4827d4568f3b..a35dba2f955c8ebb97da9539fd579ee38df8dd45 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.po
@@ -10,101 +10,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\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"
+"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Errore bat egon da kontaktua gehitzerakoan"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "elementuaren izena ez da ezarri."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "IDa ez da ezarri."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Ezin da propieta hutsa gehitu."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Behintzat helbide eremuetako bat bete behar da."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Errorea kontaktu propietatea gehitzean."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Ez da IDrik eman"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Errorea kontrol-batura ezartzean."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Ez dira ezabatzeko kategoriak hautatu."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ez da helbide libururik aurkitu."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ez da kontakturik aurkitu."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID falta da"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Errorea VCard analizatzean hurrengo IDrako: \""
 
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Errore bat egon da helbide liburua gehitzean."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Errore bat egon da helbide-liburua aktibatzen."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Ez da kontaktuaren IDrik eman."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Errore bat izan da kontaktuaren argazkia igotzerakoan."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Errore bat izan da aldi bateko fitxategia gordetzerakoan."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Kargatzen ari den argazkia ez da egokia."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "IDa ez da ezarri."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea."
@@ -113,328 +109,391 @@ msgstr "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.
 msgid "Error deleting contact property."
 msgstr "Errorea kontaktu propietatea ezabatzean."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Kontaktuaren IDa falta da."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Kontaktuaren IDa falta da."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Ez da argazkiaren bide-izenik eman."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Fitxategia ez da existitzen:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Errore bat izan da irudia kargatzearkoan."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Errore bat izan da kontaktu objetua lortzean."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Errore bat izan da PHOTO propietatea lortzean."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Errore bat izan da kontaktua gordetzean."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Errore bat izan da irudiaren tamaina aldatzean"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Errore bat izan da irudia mozten"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Errore bat izan da aldi bateko irudia sortzen"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Ezin izan da irudia aurkitu:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "elementuaren izena ez da ezarri."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "Kontrol-batura ezarri gabe dago."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Errore bat egon da helbide liburua eguneratzen."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Aldi bateko karpeta falta da"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ezin izan da aldi bateko irudia gorde:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ezin izan da aldi bateko irudia kargatu:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Barkatu, aukera hau ez da oriandik inplementatu"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Inplementatu gabe"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Ezin izan da eposta baliagarri bat hartu."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Errorea"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktua"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Propietate hau ezin da hutsik egon."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Editatu izena"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Askatu VCF fitxategia kontaktuak inportatzeko."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Hautatu mota"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Emaitza:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " inportatua, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "huts egin du."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Helbide liburua ez da aurkitu"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mezua"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Jaioteguna"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}ren jaioteguna"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontaktua"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Gehitu kontaktua"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Inportatu"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Helbide Liburuak"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Itxi"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfiguratu Helbide Liburuak"
@@ -443,11 +502,7 @@ msgstr "Konfiguratu Helbide Liburuak"
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCFtik inportatu"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav lotura"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Editatu"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Deskargatu kontaktua"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Askatu argazkia igotzeko"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Ezabatu kontaktua"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Ezabatu oraingo argazkia"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Askatu argazkia igotzeko"
+msgid "Edit current photo"
+msgstr "Editatu oraingo argazkia"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Igo argazki berria"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Hautatu argazki bat ownCloudetik"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editatu izenaren zehaztasunak"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Ezizena"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Sartu ezizena"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Jaioteguna"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Banatu taldeak komekin"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editatu taldeak"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Hobetsia"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Mesedez sartu eposta helbide egoki bat"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Sartu eposta helbidea"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Bidali helbidera"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Ezabatu eposta helbidea"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Sartu telefono zenbakia"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Ezabatu telefono zenbakia"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ikusi mapan"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editatu helbidearen zehaztasunak"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Gehitu oharrak hemen."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Gehitu eremua"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilaren irudia"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Oharra"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Ezabatu oraingo argazkia"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Editatu oraingo argazkia"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Igo argazki berria"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Deskargatu kontaktua"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Hautatu argazki bat ownCloudetik"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Ezabatu kontaktua"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Aldi bateko irudia cachetik ezabatu da."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editatu helbidea"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Mota"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Posta kutxa"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Hedatua"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Kalea"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Hiria"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Eskualdea"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Posta kodea"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Herrialdea"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editatu kategoriak"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Gehitu"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Helbide-liburua"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Bidali"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -766,33 +829,10 @@ msgstr "sortu helbide liburu berria"
 msgid "Name of new addressbook"
 msgstr "Helbide liburuaren izena"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Inportatu"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kontaktuak inportatzen"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Hautau helburuko helbide liburua:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Hautatu disko gogorretik"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Ez duzu kontakturik zure helbide liburuan."
@@ -805,18 +845,34 @@ msgstr "Gehitu kontaktua"
 msgid "Configure addressbooks"
 msgstr "Konfiguratu helbide liburuak"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV sinkronizazio helbideak"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "informazio gehiago"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Helbide nagusia"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 070d14864c6bef0309baf50b3d24e33e91ff2617..8fdfcdcd07b7a5c83a9e22865dc4124e7aef9c5f 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/owncloud/language/eu/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Urtarrila"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Otsaila"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Martxoa"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Apirila"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maiatza"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Ekaina"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Uztaila"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Abuztua"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Iraila"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Urria"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Azaroa"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Abendua"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Ezeztatu"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ez"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Bai"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ados"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ez da ezabatzeko kategoriarik hautatu."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Errorea"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloudeko pasahitza berrezarri"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
 
@@ -241,14 +245,10 @@ msgstr "Bukatu konfigurazioa"
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ezarpenak"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index e4da710339b602db549984b819c13cdc5f4fff7e..e62061a695b0700e8e970992cd7c1aef52d58ff3 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
diff --git a/l10n/eu_ES/bookmarks.po b/l10n/eu_ES/bookmarks.po
new file mode 100644
index 0000000000000000000000000000000000000000..c012dfcd46508ed9ad474e828a2e897a3203f596
--- /dev/null
+++ b/l10n/eu_ES/bookmarks.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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-27 22:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:14
+msgid "Bookmarks"
+msgstr ""
+
+#: bookmarksHelper.php:99
+msgid "unnamed"
+msgstr ""
+
+#: templates/bookmarklet.php:5
+msgid ""
+"Drag this to your browser bookmarks and click it, when you want to bookmark "
+"a webpage quickly:"
+msgstr ""
+
+#: templates/bookmarklet.php:7
+msgid "Read later"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Address"
+msgstr ""
+
+#: templates/list.php:14
+msgid "Title"
+msgstr ""
+
+#: templates/list.php:15
+msgid "Tags"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Save bookmark"
+msgstr ""
+
+#: templates/list.php:22
+msgid "You have no bookmarks"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Bookmarklet <br />"
+msgstr ""
diff --git a/l10n/eu_ES/calendar.po b/l10n/eu_ES/calendar.po
new file mode 100644
index 0000000000000000000000000000000000000000..3a9d6f6d233a3b1b873aa7a89ed6ea46550d7010
--- /dev/null
+++ b/l10n/eu_ES/calendar.po
@@ -0,0 +1,814 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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: 2011-09-03 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr ""
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr ""
+
+#: ajax/categories/rescan.php:29
+msgid "No calendars found."
+msgstr ""
+
+#: ajax/categories/rescan.php:37
+msgid "No events found."
+msgstr ""
+
+#: ajax/event/edit.form.php:20
+msgid "Wrong calendar"
+msgstr ""
+
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr ""
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr ""
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr ""
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr ""
+
+#: ajax/settings/guesstimezone.php:25
+msgid "New Timezone:"
+msgstr ""
+
+#: ajax/settings/settimezone.php:23
+msgid "Timezone changed"
+msgstr ""
+
+#: ajax/settings/settimezone.php:25
+msgid "Invalid request"
+msgstr ""
+
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
+#: templates/settings.php:12
+msgid "Calendar"
+msgstr ""
+
+#: js/calendar.js:828
+msgid "ddd"
+msgstr ""
+
+#: js/calendar.js:829
+msgid "ddd M/d"
+msgstr ""
+
+#: js/calendar.js:830
+msgid "dddd M/d"
+msgstr ""
+
+#: js/calendar.js:833
+msgid "MMMM yyyy"
+msgstr ""
+
+#: js/calendar.js:835
+msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
+msgstr ""
+
+#: js/calendar.js:837
+msgid "dddd, MMM d, yyyy"
+msgstr ""
+
+#: lib/app.php:121
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:122
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:123
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:124
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:125
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:126
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:127
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:128
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:129
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:131
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Questions"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
+msgid "unnamed"
+msgstr ""
+
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr ""
+
+#: lib/object.php:372
+msgid "Does not repeat"
+msgstr ""
+
+#: lib/object.php:373
+msgid "Daily"
+msgstr ""
+
+#: lib/object.php:374
+msgid "Weekly"
+msgstr ""
+
+#: lib/object.php:375
+msgid "Every Weekday"
+msgstr ""
+
+#: lib/object.php:376
+msgid "Bi-Weekly"
+msgstr ""
+
+#: lib/object.php:377
+msgid "Monthly"
+msgstr ""
+
+#: lib/object.php:378
+msgid "Yearly"
+msgstr ""
+
+#: lib/object.php:388
+msgid "never"
+msgstr ""
+
+#: lib/object.php:389
+msgid "by occurrences"
+msgstr ""
+
+#: lib/object.php:390
+msgid "by date"
+msgstr ""
+
+#: lib/object.php:400
+msgid "by monthday"
+msgstr ""
+
+#: lib/object.php:401
+msgid "by weekday"
+msgstr ""
+
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
+msgid "Monday"
+msgstr ""
+
+#: lib/object.php:412 templates/calendar.php:5
+msgid "Tuesday"
+msgstr ""
+
+#: lib/object.php:413 templates/calendar.php:5
+msgid "Wednesday"
+msgstr ""
+
+#: lib/object.php:414 templates/calendar.php:5
+msgid "Thursday"
+msgstr ""
+
+#: lib/object.php:415 templates/calendar.php:5
+msgid "Friday"
+msgstr ""
+
+#: lib/object.php:416 templates/calendar.php:5
+msgid "Saturday"
+msgstr ""
+
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
+msgid "Sunday"
+msgstr ""
+
+#: lib/object.php:427
+msgid "events week of month"
+msgstr ""
+
+#: lib/object.php:428
+msgid "first"
+msgstr ""
+
+#: lib/object.php:429
+msgid "second"
+msgstr ""
+
+#: lib/object.php:430
+msgid "third"
+msgstr ""
+
+#: lib/object.php:431
+msgid "fourth"
+msgstr ""
+
+#: lib/object.php:432
+msgid "fifth"
+msgstr ""
+
+#: lib/object.php:433
+msgid "last"
+msgstr ""
+
+#: lib/object.php:467 templates/calendar.php:7
+msgid "January"
+msgstr ""
+
+#: lib/object.php:468 templates/calendar.php:7
+msgid "February"
+msgstr ""
+
+#: lib/object.php:469 templates/calendar.php:7
+msgid "March"
+msgstr ""
+
+#: lib/object.php:470 templates/calendar.php:7
+msgid "April"
+msgstr ""
+
+#: lib/object.php:471 templates/calendar.php:7
+msgid "May"
+msgstr ""
+
+#: lib/object.php:472 templates/calendar.php:7
+msgid "June"
+msgstr ""
+
+#: lib/object.php:473 templates/calendar.php:7
+msgid "July"
+msgstr ""
+
+#: lib/object.php:474 templates/calendar.php:7
+msgid "August"
+msgstr ""
+
+#: lib/object.php:475 templates/calendar.php:7
+msgid "September"
+msgstr ""
+
+#: lib/object.php:476 templates/calendar.php:7
+msgid "October"
+msgstr ""
+
+#: lib/object.php:477 templates/calendar.php:7
+msgid "November"
+msgstr ""
+
+#: lib/object.php:478 templates/calendar.php:7
+msgid "December"
+msgstr ""
+
+#: lib/object.php:488
+msgid "by events date"
+msgstr ""
+
+#: lib/object.php:489
+msgid "by yearday(s)"
+msgstr ""
+
+#: lib/object.php:490
+msgid "by weeknumber(s)"
+msgstr ""
+
+#: lib/object.php:491
+msgid "by day and month"
+msgstr ""
+
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
+msgid "Date"
+msgstr ""
+
+#: lib/search.php:43
+msgid "Cal."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr ""
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr ""
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr ""
+
+#: templates/calendar.php:11
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:13
+msgid "Missing fields"
+msgstr ""
+
+#: templates/calendar.php:14 templates/part.eventform.php:19
+#: templates/part.showevent.php:11
+msgid "Title"
+msgstr ""
+
+#: templates/calendar.php:16
+msgid "From Date"
+msgstr ""
+
+#: templates/calendar.php:17
+msgid "From Time"
+msgstr ""
+
+#: templates/calendar.php:18
+msgid "To Date"
+msgstr ""
+
+#: templates/calendar.php:19
+msgid "To Time"
+msgstr ""
+
+#: templates/calendar.php:20
+msgid "The event ends before it starts"
+msgstr ""
+
+#: templates/calendar.php:21
+msgid "There was a database fail"
+msgstr ""
+
+#: templates/calendar.php:38
+msgid "Week"
+msgstr ""
+
+#: templates/calendar.php:39
+msgid "Month"
+msgstr ""
+
+#: templates/calendar.php:40
+msgid "List"
+msgstr ""
+
+#: templates/calendar.php:44
+msgid "Today"
+msgstr ""
+
+#: templates/calendar.php:45
+msgid "Calendars"
+msgstr ""
+
+#: templates/calendar.php:59
+msgid "There was a fail, while parsing the file."
+msgstr ""
+
+#: templates/part.choosecalendar.php:1
+msgid "Choose active calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:2
+msgid "Your calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:27
+#: templates/part.choosecalendar.rowfields.php:11
+msgid "CalDav Link"
+msgstr ""
+
+#: templates/part.choosecalendar.php:31
+msgid "Shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.php:48
+msgid "No shared calendars"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:8
+msgid "Share Calendar"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:14
+msgid "Download"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:17
+msgid "Edit"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.php:20
+#: templates/part.editevent.php:9
+msgid "Delete"
+msgstr ""
+
+#: templates/part.choosecalendar.rowfields.shared.php:4
+msgid "shared with you by"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "New calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:9
+msgid "Edit calendar"
+msgstr ""
+
+#: templates/part.editcalendar.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editcalendar.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editcalendar.php:29
+msgid "Calendar color"
+msgstr ""
+
+#: templates/part.editcalendar.php:42
+msgid "Save"
+msgstr ""
+
+#: templates/part.editcalendar.php:42 templates/part.editevent.php:8
+#: templates/part.newevent.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editcalendar.php:43
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.editevent.php:1
+msgid "Edit an event"
+msgstr ""
+
+#: templates/part.editevent.php:10
+msgid "Export"
+msgstr ""
+
+#: templates/part.eventform.php:8 templates/part.showevent.php:3
+msgid "Eventinfo"
+msgstr ""
+
+#: templates/part.eventform.php:9 templates/part.showevent.php:4
+msgid "Repeating"
+msgstr ""
+
+#: templates/part.eventform.php:10 templates/part.showevent.php:5
+msgid "Alarm"
+msgstr ""
+
+#: templates/part.eventform.php:11 templates/part.showevent.php:6
+msgid "Attendees"
+msgstr ""
+
+#: templates/part.eventform.php:13
+msgid "Share"
+msgstr ""
+
+#: templates/part.eventform.php:21
+msgid "Title of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:27 templates/part.showevent.php:19
+msgid "Category"
+msgstr ""
+
+#: templates/part.eventform.php:29
+msgid "Separate categories with commas"
+msgstr ""
+
+#: templates/part.eventform.php:30
+msgid "Edit categories"
+msgstr ""
+
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
+msgid "All Day Event"
+msgstr ""
+
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
+msgid "From"
+msgstr ""
+
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
+msgid "To"
+msgstr ""
+
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
+msgid "Advanced options"
+msgstr ""
+
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
+msgid "Location"
+msgstr ""
+
+#: templates/part.eventform.php:83
+msgid "Location of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
+msgid "Description"
+msgstr ""
+
+#: templates/part.eventform.php:91
+msgid "Description of the Event"
+msgstr ""
+
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
+msgid "Repeat"
+msgstr ""
+
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
+msgid "Advanced"
+msgstr ""
+
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
+msgid "Select weekdays"
+msgstr ""
+
+#: templates/part.eventform.php:164 templates/part.eventform.php:177
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
+msgid "Select days"
+msgstr ""
+
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
+msgid "and the events day of year."
+msgstr ""
+
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
+msgid "and the events day of month."
+msgstr ""
+
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
+msgid "Select months"
+msgstr ""
+
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
+msgid "Select weeks"
+msgstr ""
+
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
+msgid "and the events week of year."
+msgstr ""
+
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
+msgid "Interval"
+msgstr ""
+
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
+msgid "End"
+msgstr ""
+
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
+msgid "occurrences"
+msgstr ""
+
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr ""
+
+#: templates/part.import.php:17
+msgid "Import a calendar file"
+msgstr ""
+
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr ""
+
+#: templates/part.import.php:36
+msgid "Name of new calendar"
+msgstr ""
+
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
+
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
+
+#: templates/part.import.php:47
+msgid "Import"
+msgstr ""
+
+#: templates/part.import.php:56
+msgid "Close Dialog"
+msgstr ""
+
+#: templates/part.newevent.php:1
+msgid "Create a new event"
+msgstr ""
+
+#: templates/part.showevent.php:1
+msgid "View an event"
+msgstr ""
+
+#: templates/part.showevent.php:23
+msgid "No categories selected"
+msgstr ""
+
+#: templates/part.showevent.php:37
+msgid "of"
+msgstr ""
+
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
+msgid "at"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Timezone"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Check always for changes of the timezone"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Timeformat"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "24h"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "12h"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "First day of the week"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
+
+#: templates/share.dropdown.php:20
+msgid "Users"
+msgstr ""
+
+#: templates/share.dropdown.php:21
+msgid "select users"
+msgstr ""
+
+#: templates/share.dropdown.php:36 templates/share.dropdown.php:62
+msgid "Editable"
+msgstr ""
+
+#: templates/share.dropdown.php:48
+msgid "Groups"
+msgstr ""
+
+#: templates/share.dropdown.php:49
+msgid "select groups"
+msgstr ""
+
+#: templates/share.dropdown.php:75
+msgid "make public"
+msgstr ""
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
new file mode 100644
index 0000000000000000000000000000000000000000..ff9ad670179a691564fc8d7e59374d4d6729df23
--- /dev/null
+++ b/l10n/eu_ES/contacts.po
@@ -0,0 +1,875 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addcontact.php:47
+msgid "There was an error adding the contact."
+msgstr ""
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr ""
+
+#: ajax/addproperty.php:67
+msgid "At least one of the address fields has to be filled out."
+msgstr ""
+
+#: ajax/addproperty.php:76
+msgid "Trying to add duplicate property: "
+msgstr ""
+
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:17
+msgid "No ID provided"
+msgstr ""
+
+#: ajax/categories/categoriesfor.php:34
+msgid "Error setting checksum."
+msgstr ""
+
+#: ajax/categories/delete.php:19
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/categories/delete.php:26
+msgid "No address books found."
+msgstr ""
+
+#: ajax/categories/delete.php:34
+msgid "No contacts found."
+msgstr ""
+
+#: ajax/contactdetails.php:31
+msgid "Missing ID"
+msgstr ""
+
+#: ajax/contactdetails.php:36
+msgid "Error parsing VCard for ID: \""
+msgstr ""
+
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
+msgid "No contact ID was submitted."
+msgstr ""
+
+#: ajax/currentphoto.php:34
+msgid "Error reading contact photo."
+msgstr ""
+
+#: ajax/currentphoto.php:46
+msgid "Error saving temporary file."
+msgstr ""
+
+#: ajax/currentphoto.php:49
+msgid "The loading photo is not valid."
+msgstr ""
+
+#: ajax/deleteproperty.php:36
+msgid "Information about vCard is incorrect. Please reload the page."
+msgstr ""
+
+#: ajax/deleteproperty.php:43
+msgid "Error deleting contact property."
+msgstr ""
+
+#: ajax/editname.php:31
+msgid "Contact ID is missing."
+msgstr ""
+
+#: ajax/oc_photo.php:32
+msgid "No photo path was submitted."
+msgstr ""
+
+#: ajax/oc_photo.php:39
+msgid "File doesn't exist:"
+msgstr ""
+
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
+msgid "Error loading image."
+msgstr ""
+
+#: ajax/savecrop.php:64
+msgid "Error getting contact object."
+msgstr ""
+
+#: ajax/savecrop.php:73
+msgid "Error getting PHOTO property."
+msgstr ""
+
+#: ajax/savecrop.php:90
+msgid "Error saving contact."
+msgstr ""
+
+#: ajax/savecrop.php:100
+msgid "Error resizing image"
+msgstr ""
+
+#: ajax/savecrop.php:103
+msgid "Error cropping image"
+msgstr ""
+
+#: ajax/savecrop.php:106
+msgid "Error creating temporary image"
+msgstr ""
+
+#: ajax/savecrop.php:109
+msgid "Error finding image: "
+msgstr ""
+
+#: ajax/saveproperty.php:40
+msgid "checksum is not set."
+msgstr ""
+
+#: ajax/saveproperty.php:59
+msgid "Information about vCard is incorrect. Please reload the page: "
+msgstr ""
+
+#: ajax/saveproperty.php:64
+msgid "Something went FUBAR. "
+msgstr ""
+
+#: ajax/saveproperty.php:133
+msgid "Error updating contact property."
+msgstr ""
+
+#: ajax/updateaddressbook.php:21
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/updateaddressbook.php:25
+msgid "Error updating addressbook."
+msgstr ""
+
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
+msgid "Error uploading contacts to storage."
+msgstr ""
+
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
+msgid "Couldn't save temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
+msgid "Couldn't load temporary image: "
+msgstr ""
+
+#: ajax/uploadphoto.php:69
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: appinfo/app.php:19
+msgid "Contacts"
+msgstr ""
+
+#: js/contacts.js:64
+msgid "Sorry, this functionality has not been implemented yet"
+msgstr ""
+
+#: js/contacts.js:64
+msgid "Not implemented"
+msgstr ""
+
+#: js/contacts.js:69
+msgid "Couldn't get a valid address."
+msgstr ""
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
+msgid "Error"
+msgstr ""
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
+msgid "This property has to be non-empty."
+msgstr ""
+
+#: js/contacts.js:741
+msgid "Couldn't serialize elements."
+msgstr ""
+
+#: js/contacts.js:850 js/contacts.js:868
+msgid ""
+"'deleteProperty' called without type argument. Please report at "
+"bugs.owncloud.org"
+msgstr ""
+
+#: js/contacts.js:884
+msgid "Edit name"
+msgstr ""
+
+#: js/contacts.js:1165
+msgid "No files selected for upload."
+msgstr ""
+
+#: js/contacts.js:1173
+msgid ""
+"The file you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: js/contacts.js:1338 js/contacts.js:1372
+msgid "Select type"
+msgstr ""
+
+#: js/loader.js:49
+msgid "Result: "
+msgstr ""
+
+#: js/loader.js:49
+msgid " imported, "
+msgstr ""
+
+#: js/loader.js:49
+msgid " failed."
+msgstr ""
+
+#: lib/app.php:34
+msgid "Addressbook not found."
+msgstr ""
+
+#: lib/app.php:46
+msgid "This is not your addressbook."
+msgstr ""
+
+#: lib/app.php:65
+msgid "Contact could not be found."
+msgstr ""
+
+#: lib/app.php:109 templates/part.contact.php:116
+msgid "Address"
+msgstr ""
+
+#: lib/app.php:110
+msgid "Telephone"
+msgstr ""
+
+#: lib/app.php:111 templates/part.contact.php:115
+msgid "Email"
+msgstr ""
+
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
+msgid "Organization"
+msgstr ""
+
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+msgid "Work"
+msgstr ""
+
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+msgid "Home"
+msgstr ""
+
+#: lib/app.php:130
+msgid "Mobile"
+msgstr ""
+
+#: lib/app.php:132
+msgid "Text"
+msgstr ""
+
+#: lib/app.php:133
+msgid "Voice"
+msgstr ""
+
+#: lib/app.php:134
+msgid "Message"
+msgstr ""
+
+#: lib/app.php:135
+msgid "Fax"
+msgstr ""
+
+#: lib/app.php:136
+msgid "Video"
+msgstr ""
+
+#: lib/app.php:137
+msgid "Pager"
+msgstr ""
+
+#: lib/app.php:143
+msgid "Internet"
+msgstr ""
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr ""
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Addressbooks"
+msgstr ""
+
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:1
+msgid "Configure Address Books"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:16
+msgid "New Address Book"
+msgstr ""
+
+#: templates/part.chooseaddressbook.php:21
+#: templates/part.chooseaddressbook.rowfields.php:8
+msgid "CardDav Link"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:11
+msgid "Download"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:14
+msgid "Edit"
+msgstr ""
+
+#: templates/part.chooseaddressbook.rowfields.php:17
+#: 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
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
+
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
+
+#: templates/part.contact.php:19
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
+msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
+msgstr ""
+
+#: templates/part.contact.php:35
+msgid "Edit name details"
+msgstr ""
+
+#: templates/part.contact.php:40 templates/part.contact.php:112
+msgid "Nickname"
+msgstr ""
+
+#: templates/part.contact.php:41
+msgid "Enter nickname"
+msgstr ""
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr ""
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
+msgid "Groups"
+msgstr ""
+
+#: templates/part.contact.php:48
+msgid "Separate groups with commas"
+msgstr ""
+
+#: templates/part.contact.php:49
+msgid "Edit groups"
+msgstr ""
+
+#: templates/part.contact.php:62 templates/part.contact.php:76
+msgid "Preferred"
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Please specify a valid email address."
+msgstr ""
+
+#: templates/part.contact.php:63
+msgid "Enter email address"
+msgstr ""
+
+#: templates/part.contact.php:67
+msgid "Mail to address"
+msgstr ""
+
+#: templates/part.contact.php:68
+msgid "Delete email address"
+msgstr ""
+
+#: templates/part.contact.php:77
+msgid "Enter phone number"
+msgstr ""
+
+#: templates/part.contact.php:81
+msgid "Delete phone number"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "View on map"
+msgstr ""
+
+#: templates/part.contact.php:91
+msgid "Edit address details"
+msgstr ""
+
+#: templates/part.contact.php:102
+msgid "Add notes here."
+msgstr ""
+
+#: templates/part.contact.php:109
+msgid "Add field"
+msgstr ""
+
+#: templates/part.contact.php:114
+msgid "Phone"
+msgstr ""
+
+#: templates/part.contact.php:117
+msgid "Note"
+msgstr ""
+
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr ""
+
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr ""
+
+#: templates/part.cropphoto.php:65
+msgid "The temporary image has been removed from cache."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:6
+msgid "Edit address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:10
+msgid "Type"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
+msgid "PO Box"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
+msgid "Extended"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
+msgid "City"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:42
+msgid "Region"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:16
+msgid "Addressbook"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:23
+msgid "Hon. prefixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:27
+msgid "Miss"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:28
+msgid "Ms"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:29
+msgid "Mr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:30
+msgid "Sir"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:31
+msgid "Mrs"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:32
+msgid "Dr"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:35
+msgid "Given name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:37
+msgid "Additional names"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:39
+msgid "Family name"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:41
+msgid "Hon. suffixes"
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:45
+msgid "J.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:46
+msgid "M.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:47
+msgid "D.O."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:48
+msgid "D.C."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:49
+msgid "Ph.D."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:50
+msgid "Esq."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:51
+msgid "Jr."
+msgstr ""
+
+#: templates/part.edit_name_dialog.php:52
+msgid "Sn."
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "New Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:9
+msgid "Edit Addressbook"
+msgstr ""
+
+#: templates/part.editaddressbook.php:12
+msgid "Displayname"
+msgstr ""
+
+#: templates/part.editaddressbook.php:23
+msgid "Active"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Save"
+msgstr ""
+
+#: templates/part.editaddressbook.php:29
+msgid "Submit"
+msgstr ""
+
+#: templates/part.editaddressbook.php:30
+msgid "Cancel"
+msgstr ""
+
+#: templates/part.import.php:1
+msgid "Import a contacts file"
+msgstr ""
+
+#: templates/part.import.php:6
+msgid "Please choose the addressbook"
+msgstr ""
+
+#: templates/part.import.php:10
+msgid "create a new addressbook"
+msgstr ""
+
+#: templates/part.import.php:15
+msgid "Name of new addressbook"
+msgstr ""
+
+#: templates/part.import.php:20
+msgid "Importing contacts"
+msgstr ""
+
+#: templates/part.no_contacts.php:2
+msgid "You have no contacts in your addressbook."
+msgstr ""
+
+#: templates/part.no_contacts.php:4
+msgid "Add contact"
+msgstr ""
+
+#: templates/part.no_contacts.php:5
+msgid "Configure addressbooks"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..98e3012b65cd0f55a4741c8f8001c47534df8163
--- /dev/null
+++ b/l10n/eu_ES/core.po
@@ -0,0 +1,272 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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:53+0000\n"
+"Last-Translator: owncloud_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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/jquery-ui-1.8.16.custom.min.js:511
+msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr ""
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
+msgid "January"
+msgstr ""
+
+#: js/js.js:573
+msgid "February"
+msgstr ""
+
+#: js/js.js:573
+msgid "March"
+msgstr ""
+
+#: js/js.js:573
+msgid "April"
+msgstr ""
+
+#: js/js.js:573
+msgid "May"
+msgstr ""
+
+#: js/js.js:573
+msgid "June"
+msgstr ""
+
+#: js/js.js:574
+msgid "July"
+msgstr ""
+
+#: js/js.js:574
+msgid "August"
+msgstr ""
+
+#: js/js.js:574
+msgid "September"
+msgstr ""
+
+#: js/js.js:574
+msgid "October"
+msgstr ""
+
+#: js/js.js:574
+msgid "November"
+msgstr ""
+
+#: js/js.js:574
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "Error"
+msgstr ""
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:1
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:23
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:29 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:35
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:37
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:49 templates/installation.php:60
+#: templates/installation.php:70
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:82
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:86
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:96
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:49
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..9b8420158303161bae0ed238acb4b5c146b76f21
--- /dev/null
+++ b/l10n/eu_ES/files.po
@@ -0,0 +1,222 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:95
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:97 templates/index.php:56
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:631 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:632 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:659
+msgid "folder"
+msgstr ""
+
+#: js/files.js:661
+msgid "folders"
+msgstr ""
+
+#: js/files.js:669
+msgid "file"
+msgstr ""
+
+#: js/files.js:671
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:21
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:66
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:71
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:74
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/eu_ES/gallery.po b/l10n/eu_ES/gallery.po
new file mode 100644
index 0000000000000000000000000000000000000000..54096c308b2797225d994c19b0287b11cee6aadd
--- /dev/null
+++ b/l10n/eu_ES/gallery.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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-01-15 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:39
+msgid "Pictures"
+msgstr ""
+
+#: js/pictures.js:12
+msgid "Share gallery"
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Error: "
+msgstr ""
+
+#: js/pictures.js:32
+msgid "Internal error"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Slideshow"
+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 ""
+
+#: templates/view_album.php:43
+msgid "New album name"
+msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..366fbd9fb9c0b3158c091d6a20652dc152917714
--- /dev/null
+++ b/l10n/eu_ES/lib.po
@@ -0,0 +1,112 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: app.php:287
+msgid "Help"
+msgstr ""
+
+#: app.php:294
+msgid "Personal"
+msgstr ""
+
+#: app.php:299
+msgid "Settings"
+msgstr ""
+
+#: app.php:304
+msgid "Users"
+msgstr ""
+
+#: app.php:311
+msgid "Apps"
+msgstr ""
+
+#: app.php:313
+msgid "Admin"
+msgstr ""
+
+#: files.php:245
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:246
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:246 files.php:271
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:270
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:86
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:87
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:88
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:91
+msgid "today"
+msgstr ""
+
+#: template.php:92
+msgid "yesterday"
+msgstr ""
+
+#: template.php:93
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:94
+msgid "last month"
+msgstr ""
+
+#: template.php:95
+msgid "months ago"
+msgstr ""
+
+#: template.php:96
+msgid "last year"
+msgstr ""
+
+#: template.php:97
+msgid "years ago"
+msgstr ""
diff --git a/l10n/eu_ES/media.po b/l10n/eu_ES/media.po
new file mode 100644
index 0000000000000000000000000000000000000000..7b6fee29b9cc2395960c243f8e4f12299e1a465a
--- /dev/null
+++ b/l10n/eu_ES/media.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: appinfo/app.php:45 templates/player.php:8
+msgid "Music"
+msgstr ""
+
+#: js/music.js:18
+msgid "Add album to playlist"
+msgstr ""
+
+#: templates/music.php:3 templates/player.php:12
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:26 templates/player.php:13
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6 templates/player.php:14
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:25
+msgid "Rescan Collection"
+msgstr ""
+
+#: templates/music.php:37
+msgid "Artist"
+msgstr ""
+
+#: templates/music.php:38
+msgid "Album"
+msgstr ""
+
+#: templates/music.php:39
+msgid "Title"
+msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..6e77d37cb42815daa4fdbf528491fb2436a6e7d2
--- /dev/null
+++ b/l10n/eu_ES/settings.po
@@ -0,0 +1,218 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:67
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:31 js/apps.js:54
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:28
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "More"
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:24
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:27
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "-licensed"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "by"
+msgstr ""
+
+#: templates/help.php:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:22
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:23
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:31
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "You use"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "of the available"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password got changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80
+msgid "SubAdmin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:112
+msgid "SubAdmin for ..."
+msgstr ""
+
+#: templates/users.php:145
+msgid "Delete"
+msgstr ""
diff --git a/l10n/fa/contacts.po b/l10n/fa/contacts.po
index 15075e66e4aebfb32e2d749d985e3f6224a31d0f..f453f6e2c611ae4d6de4d85b7ad891d6fb3435df 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\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"
+"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "نام اصلی تنظیم نشده است"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "شناسه تعیین نشده"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "نمیتوان یک  خاصیت خالی ایجاد کرد"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "At least one of the address fields has to be filled out. "
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "امتحان کردن برای وارد کردن مشخصات تکراری"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "خطا درهنگام افزودن ویژگی"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "هیچ شناسه ای ارائه نشده"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "خطا در تنظیم checksum"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "هیچ گروهی برای حذف شدن در نظر گرفته نشده"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "هیچ کتابچه نشانی پیدا نشد"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "هیچ شخصی پیدا نشد"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "نشانی گم شده"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "خطا در تجزیه کارت ویزا برای شناسه:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "نمیتوانید یک نام خالی را به کتابچه نشانی ها افزود"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "خطا درهنگام افزودن کتابچه نشانی ها"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "خطا درهنگام فعال سازیکتابچه نشانی ها"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "هیچ اطلاعاتی راجع به شناسه ارسال نشده"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "خطا در خواندن اطلاعات تصویر"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "خطا در ذخیره پرونده موقت"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "بارگزاری تصویر امکان پذیر نیست"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "شناسه تعیین نشده"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید"
@@ -111,328 +107,391 @@ msgstr "اطلاعات درمورد vCard شما اشتباه است لطفا ص
 msgid "Error deleting contact property."
 msgstr "خطا در هنگام پاک کرد ویژگی"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "اطلاعات شناسه گم شده"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "شما اطلاعات شناسه را فراموش کرده اید"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "هیچ نشانی از تصویرارسال نشده"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "پرونده وجود ندارد"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "خطا در بارگزاری تصویر"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "خطا در گرفتن اطلاعات شخص"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "خطا در دربافت تصویر ویژگی شخصی"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "خطا در ذخیره سازی اطلاعات"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "خطا در تغییر دادن اندازه تصویر"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "خطا در برداشت تصویر"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "خطا در ساخت تصویر  temporary"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "نام اصلی تنظیم نشده است"
+msgstr "خطا در پیدا کردن تصویر:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum تنظیم شده نیست"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "چند چیز به FUBAR رفتند"
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "خطا در هنگام بارگذاری و ذخیره سازی"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "حجم آپلود از طریق Php.ini تعیین می شود"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "قابلیت ذخیره تصویر  موقت وجود ندارد:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "قابلیت بارگذاری تصویر  موقت وجود ندارد:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "با عرض پوزش،این قابلیت هنوز اجرا نشده است"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "انجام نشد"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Couldn't get a valid address."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "خطا"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "اشخاص"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "نام تغییر"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "نوع را انتخاب کنید"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "نتیجه:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "وارد شد،"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "ناموفق"
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "کتابچه نشانی ها یافت نشد"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "این کتابچه ی نشانه های شما نیست"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "نشانی"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "تلفن"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "نشانی پست الکترنیک"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "نهاد(ارگان)"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "موبایل"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "متن"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "صدا"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "پیغام"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "دورنگار:"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "رسانه تصویری"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "صفحه"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "اینترنت"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "روزتولد"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "روز تولد {name} است"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "اشخاص"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "وارد کردن"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "کتابچه ی نشانی ها"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "بستن"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "پیکر بندی کتابچه نشانی ها"
@@ -441,11 +500,7 @@ msgstr "پیکر بندی کتابچه نشانی ها"
 msgid "New Address Book"
 msgstr "کتابچه نشانه های جدید"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "وارد شده از VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Link"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "ویرایش"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "دانلود مشخصات اشخاص"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "تصویر را به اینجا بکشید تا بار گذازی شود"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "پاک کردن  اطلاعات شخص مورد نظر"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "پاک کردن تصویر کنونی"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "تصویر را به اینجا بکشید تا بار گذازی شود"
+msgid "Edit current photo"
+msgstr "ویرایش تصویر کنونی"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "بار گذاری یک تصویر جدید"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "انتخاب یک تصویر از ابر های شما"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "ویرایش نام جزئیات"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "نام مستعار"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "یک نام مستعار وارد کنید"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "روزتولد"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "جدا کردن گروه ها به وسیله درنگ نما"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "ویرایش گروه ها"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "مقدم"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "یک  پست الکترونیکی وارد کنید"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "به نشانی  ارسال شد"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "پاک کردن نشانی پست الکترونیکی"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "شماره تلفن راوارد کنید"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "پاک کردن شماره تلفن"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "دیدن روی نقشه"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "ویرایش جزئیات نشانی ها"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "اینجا یادداشت ها را بیافزایید"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "اضافه کردن فیلد"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "تصویر پروفایل"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "شماره تلفن"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "یادداشت"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "پاک کردن تصویر کنونی"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "ویرایش تصویر کنونی"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "بار گذاری یک تصویر جدید"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "دانلود مشخصات اشخاص"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "انتخاب یک تصویر از ابر های شما"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "پاک کردن  اطلاعات شخص مورد نظر"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "تصویر موقت از کش پاک شد."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "ویرایش نشانی"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "نوع"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "صندوق پستی"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "تمدید شده"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "خیابان"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "شهر"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "ناحیه"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "کد پستی"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "کشور"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "ویرایش گروه"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "افزودن"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "کتابچه ی نشانی ها"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "ارسال"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -764,33 +827,10 @@ msgstr "یک کتابچه نشانی بسازید"
 msgid "Name of new addressbook"
 msgstr "نام کتابچه نشانی جدید"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "وارد کردن"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "وارد کردن اشخاص"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "یک کتابچه نشانی انتخاب کنید تا وارد شود"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "انتخاب از دیسک سخت"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "شماهیچ شخصی در  کتابچه نشانی خود ندارید"
@@ -803,18 +843,34 @@ msgstr "افزودن اطلاعات شخص مورد نظر"
 msgid "Configure addressbooks"
 msgstr "پیکربندی کتابچه ی نشانی ها"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV syncing addresses "
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "اطلاعات بیشتر"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "نشانی اولیه"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X "
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 6930fb647c66620da2ee3fe96533f3f527ca0801..e2c97e1c454c9c0291aa9eb23f99ac23cb702a1a 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/owncloud/language/fa/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +32,89 @@ msgstr "این گروه از قبل اضافه شده"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "ژانویه"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "فبریه"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "مارس"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "آوریل"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "می"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "ژوئن"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "جولای"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "آگوست"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "سپتامبر"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "اکتبر"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "نوامبر"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "دسامبر"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "منصرف شدن"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "نه"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "بله"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "قبول"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "خطا"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "گذرواژه ابرهای شما تغییرکرد"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
 
@@ -240,14 +244,10 @@ msgstr "اتمام نصب"
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "تنظیمات"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index ba78e2c9ca2927f511cc6afb38fa061e4615b1f5..636f1077ab5ce0fea8ee16d4ff0d95bed8f2e52e 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index a6bb8bb156c9e116c1bc21245f55e9d7078f28fd..8ec5c5cc6203fe528d783334c9eacd12419325a8 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-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 10:36+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "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"
@@ -85,20 +85,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr "Virhe jäsennettäessä vCardia tunnisteelle: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Virhe tallennettaessa tilapäistiedostoa."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -126,31 +126,31 @@ msgstr "Tiedostoa ei ole olemassa:"
 msgid "Error loading image."
 msgstr "Virhe kuvaa ladatessa."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Virhe yhteystietoa tallennettaessa."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Virhe asettaessa kuvaa uuteen kokoon"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Virhe rajatessa kuvaa"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Virhe luotaessa väliaikaista kuvaa"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -182,110 +182,110 @@ msgstr "Virhe päivitettäessä osoitekirjaa."
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virhettä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lähetetty tiedosto lähetettiin vain osittain"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Tiedostoa ei lähetetty"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Uusi"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -301,129 +301,129 @@ msgstr " tuotu, "
 msgid " failed."
 msgstr " epäonnistui."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Osoitekirjaa ei löytynyt."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -431,63 +431,67 @@ msgstr "Kysymykset"
 msgid "{name}'s Birthday"
 msgstr "Henkilön {name} syntymäpäivä"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lisää yhteystieto"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Tuo"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Osoitekirjat"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Sulje"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Päivitä yhteystietoluettelo"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Lisää uusi yhteystieto"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Lisää uusi osoitekirja"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Poista nykyinen yhteystieto"
 
@@ -854,22 +858,22 @@ msgstr "Anna nimi"
 msgid "Enter description"
 msgstr "Anna kuvaus"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV-synkronointiosoitteet"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index a770488ca378f47b5a3998a938e0036aa9cb3f60..652247ff5c86a73192e6337e17798aef644b4464 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -12,10 +12,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.net/projects/p/owncloud/language/fi_FI/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,83 +38,87 @@ msgstr "Tämä luokka on jo olemassa: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
-msgid "January"
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Asetukset"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
+msgid "January"
+msgstr "Tammikuu"
+
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Helmikuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Huhtikuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Peru"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Kyllä"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Luokkia ei valittu poistettavaksi."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud-salasanan nollaus"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
 
@@ -244,14 +248,10 @@ msgstr "Viimeistele asennus"
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Asetukset"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 59576c1e40f15cd5205121724d0dfae01ae2f914..e81152bac7d0c9b9cb038e8630bad2ab958ae775 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr "Lopeta jakaminen"
 msgid "Delete"
 msgstr "Poista"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
diff --git a/l10n/fr/bookmarks.po b/l10n/fr/bookmarks.po
index ba57cdc64fcc69e2f713ad8638c193e382522804..f3f172409f29d966efe1141629cb8a53015bd480 100644
--- a/l10n/fr/bookmarks.po
+++ b/l10n/fr/bookmarks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00: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,42 +21,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Favoris"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "sans titre"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Lire plus tard"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titre"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Étiquettes"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Sauvegarder le favori"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Vous n'avez aucun favori"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Gestionnaire de favoris <br />"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index ee964a08fb67587bbc3f96cca2266404ccfce794..00c24da8a979f146f0828befc3930cd2906d2209 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:15+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 13:48+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"
@@ -84,19 +84,19 @@ msgstr "Calendrier"
 
 #: js/calendar.js:828
 msgid "ddd"
-msgstr "jjj"
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr "jjj M/j"
+msgstr "ddd d/M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr "jjjj M/j"
+msgstr "dddd d/M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr "MMMM aaaa"
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -104,7 +104,7 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr "jjjj, MMM j, aaaa"
+msgstr "dddd, d MMM, yyyy"
 
 #: lib/app.php:121
 msgid "Birthday"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 64b3e82ca19804cbdf83e34ea262ccf3dff18359..9d6d8f6ccd5428661005af3820aa74453e9c27c9 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.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-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:26+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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"
 "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"
@@ -91,20 +91,20 @@ msgstr "ID manquant"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Aucun ID de contact envoyé"
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erreur de lecture de la photo du contact."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erreur de sauvegarde du fichier temporaire."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La photo chargée est invalide."
 
@@ -132,31 +132,31 @@ msgstr "Fichier inexistant:"
 msgid "Error loading image."
 msgstr "Erreur lors du chargement de l'image."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Erreur lors de l'obtention de l'objet contact"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Erreur lors de l'obtention des propriétés de la photo"
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
@@ -188,110 +188,110 @@ msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Impossible de sauvegarder l'image temporaire :"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Impossible de charger l'image temporaire :"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Pas encore implémenté"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nouveau"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nouveau Contact"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Sélectionner un type"
 
@@ -307,129 +307,129 @@ msgstr "importé,"
 msgid " failed."
 msgstr "échoué."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Carnet d'adresses introuvable."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Business"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Livreur"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Trajet"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Rendez-vous"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Questions"
 
@@ -437,63 +437,67 @@ msgstr "Questions"
 msgid "{name}'s Birthday"
 msgstr "Anniversaire de {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importer"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Contact suivant dans la liste"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contact précédent dans la liste"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Passer au carnet d'adresses suivant/précédent"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
@@ -860,22 +864,22 @@ msgstr "Saisissez le nom"
 msgid "Enter description"
 msgstr "Saisissez une description"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Synchronisation des contacts CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "Plus d'infos"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Adresse principale"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b2609663eaf35150ca5fb6bba3f56ab0588f1fc1..79d3b618b1f9f61b555884f73647b2160bd27c81 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+#   <nathaplop@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +35,89 @@ msgstr "Cette catégorie existe déjà : "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Paramètres"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Février"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Août"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annulé"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Aucune catégorie sélectionnée pour suppression"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Réinitialisation de votre mot de passe Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
@@ -218,7 +225,7 @@ msgstr "sera utilisé"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Utilisateur de la base de données"
+msgstr "Utilisateur pour la base de données"
 
 #: templates/installation.php:86
 msgid "Database password"
@@ -240,14 +247,10 @@ msgstr "Terminer l'installation"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Paramètres"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 13258b290ff617a01f197070ec450992e221fa33..23e5b17852bc0fa0f087eb3103c4112a313c2d43 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +64,34 @@ msgstr "Ne plus partager"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "annuler"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "supprimé"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Générer un fichier ZIP, cela peut prendre du temps"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 90c10f690ede3a8ef73abe1ade16749c6bb07de5..42c784ce915857bae1d5a958d5e3c5e5e4aac955 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:22+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,94 +21,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personnel"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Applications"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administration"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Téléchargement ZIP désactivé."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Les fichiers nécessitent d'être téléchargés un par un."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Retour aux Fichiers"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "L'application n'est pas activée"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Erreur d'authentification"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "La session a expiré. Veuillez recharger la page."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "à l'instant"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "il y a 1 minute"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "il y a %d minutes"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "aujourd'hui"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "hier"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "il y a %d jours"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "le mois dernier"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "il y a plusieurs mois"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "l'année dernière"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "il y a plusieurs années"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index a519d0f7b9c3eba04841687678f1f344ee6b9a46..ea9e3f885e9224035e3568ede97e28f23354a1b6 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 10:05+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00: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"
@@ -50,11 +50,11 @@ msgstr "Langue changée"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr "Désactivé"
+msgstr "Désactiver"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr "Activé"
+msgstr "Activer"
 
 #: js/personal.js:69
 msgid "Saving..."
@@ -126,7 +126,7 @@ msgstr "Vous utilisez"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "d'espace de stockage sur un total de"
+msgstr "de votre espace de stockage d'une taille totale de"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 2ee23b52a1633ee9188c1c44f5be6ce627505f39..521bb00899b4e483851b9c2af0cb372add851142 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,100 +9,96 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Produciuse un erro (des)activando a axenda."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Produciuse un erro engadindo o contacto."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "non se nomeou o elemento."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "non se estableceu o id."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Non se pode engadir unha propiedade baleira."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Polo menos un dos campos do enderezo ten que ser cuberto."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Tentando engadir propiedade duplicada: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Produciuse un erro engadindo unha propiedade do contacto."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "Non se proveeu ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Erro establecendo a suma de verificación"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Non se seleccionaron categorías para borrado."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Non se atoparon libretas de enderezos."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Non se atoparon contactos."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "ID perdido"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Produciuse un erro engadindo a axenda."
+msgstr "Erro procesando a VCard para o ID: \""
 
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Produciuse un erro activando a axenda."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Non se enviou ningún ID de contacto."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Erro lendo a fotografía do contacto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Erro gardando o ficheiro temporal."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "A fotografía cargada non é válida."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -112,341 +108,400 @@ msgstr "A información sobre a vCard é incorrecta. Por favor volva cargar a pá
 msgid "Error deleting contact property."
 msgstr "Produciuse un erro borrando a propiedade do contacto."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Falta o ID do contacto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Non se enviou a ruta a unha foto."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "O ficheiro non existe:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Erro cargando imaxe."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erro obtendo o obxeto contacto."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erro obtendo a propiedade PHOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erro gardando o contacto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erro cambiando o tamaño da imaxe"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erro recortando a imaxe"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erro creando a imaxe temporal"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Erro buscando a imaxe: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "non se estableceu a suma de verificación."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Produciuse un erro actualizando a axenda."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Erro subindo os contactos ao almacén."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Non houbo erros, o ficheiro subeuse con éxito"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O ficheiro so foi parcialmente subido"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Non se subeu ningún ficheiro"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Falta o cartafol temporal"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Non se puido gardar a imaxe temporal: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Non se puido cargar a imaxe temporal: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Sentímolo, esta función aínda non foi implementada."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Non implementada."
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Non se puido obter un enderezo de correo válido."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Esta propiedade non pode quedar baldeira."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Editar nome"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Seleccione tipo"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultado: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " importado, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " fallou."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Non se atopou a libreta de enderezos."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Esta non é a súa axenda."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Enderezo"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Mensaxe"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Paxinador"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversario"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:182
+msgid "Call"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contacto"
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Cumpleanos de {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Engadir contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Axendas"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Pechar"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Configurar Libretas de enderezos"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Nova axenda"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Ligazón CardDav"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Descargar contacto"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Solte a foto a subir"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Borrar contacto"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Borrar foto actual"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "Editar a foto actual"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Subir unha nova foto"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Escoller foto desde ownCloud"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "Editar detalles do nome"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
+msgstr "Apodo"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
+msgstr "Introuza apodo"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversario"
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Separe grupos con comas"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "Editar grupos"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Por favor indique un enderezo de correo electrónico válido."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
-msgstr ""
+msgstr "Introduza enderezo de correo electrónico"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
-msgstr ""
+msgstr "Correo ao enderezo"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "Borrar enderezo de correo electrónico"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "Introducir número de teléfono"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "Borrar número de teléfono"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "Ver no mapa"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "Editar detalles do enderezo"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "Engadir aquí as notas."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
+msgstr "Engadir campo"
 
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Descargar contacto"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Borrar contacto"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "A imaxe temporal foi eliminada da caché."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "Editar enderezo"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Escribir"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Apartado de correos"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Ampliado"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rúa"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Autonomía"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Código postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "País"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Engadir"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "País"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -646,79 +710,79 @@ msgstr "Axenda"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Prefixos honoríficos"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Srta"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Sra/Srta"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Sra"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Apodo"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Nomes adicionais"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nome familiar"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Sufixos honorarios"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,77 +809,69 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Importar un ficheiro de contactos"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Por favor escolla unha libreta de enderezos"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "crear unha nova libreta de enderezos"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "Nome da nova libreta de enderezos"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "Importando contactos"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Non ten contactos na súa libreta de enderezos."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Engadir contacto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "Configurar libretas de enderezos"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "more info"
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "Enderezos CardDAV a sincronizar"
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr "máis información"
+
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Enderezo primario (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 97abae0775469aa4ad7b1e4c75b3947b0e2ddbae..8da22539ae6b0094ce00de717a1f621f66bd47d3 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/owncloud/language/gl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Esta categoría xa existe: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Preferencias"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Xaneiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febreiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Xuño"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Xullo"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Nadal"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Non hai categorías seleccionadas para eliminar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Restablecemento do contrasinal de Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Restablecer contrasinal de ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "Rematar configuración"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Preferencias"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index adf4d9a4f846cd16a7a7f35ea35dc450362f2b23..884f224b3b0718c3bbff128dd0289379de029895 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "xerando ficheiro ZIP, pode levar un anaco."
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 76473c148717a75042edaf6eca84d92c0d28daac..08b2d093429bf8e0d4c91703bcfaa5070ad487cf 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.po
@@ -3,106 +3,103 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\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"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "שם האלמנט לא נקבע."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "מספר מזהה לא נקבע."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "לא ניתן להוסיף מאפיין ריק."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "יש למלא לפחות אחד משדות הכתובת."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "ניסיון להוספת מאפיין כפול: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "שגיאה בהוספת מאפיין לאיש הקשר."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "לא צוין מזהה"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "שגיאה בהגדרת נתוני הביקורת."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "לא נבחור קטגוריות למחיקה."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "לא נמצאו פנקסי כתובות."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "לא נמצאו אנשי קשר."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "מזהה חסר"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
+msgstr "שגיאה בפענוח ה VCard עבור מספר המזהה: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "שגיאה בהוספת פנקס הכתובות."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "שגיאה בהפעלת פנקס הכתובות."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "מספר מזהה של אישר הקשר לא נשלח."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "שגיאה בקריאת תמונת איש הקשר."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "שגיאה בשמירת קובץ זמני."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "התמונה הנטענת אינה תקנית."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -112,231 +109,185 @@ msgstr "המידע אודות vCard אינו נכון. נא לטעון מחדש
 msgid "Error deleting contact property."
 msgstr "שגיאה במחיקת מאפיין של איש הקשר."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "מספר מזהה של אישר הקשר חסר."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "כתובת התמונה לא נשלחה"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "קובץ לא קיים:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "שגיאה בטעינת התמונה."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "שגיאה בקבלת אוביאקט איש הקשר"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "שגיאה בקבלת מידע של תמונה"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "שגיאה בשמירת איש הקשר"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "שגיאה בשינוי גודל התמונה"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "סיכום ביקורת לא נקבע."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "משהו לא התנהל כצפוי."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "שגיאה בעדכון המאפיין של איש הקשר."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "שגיאה בעדכון פנקס הכתובות."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "התרשה שגיאה בהעלאת אנשי הקשר לאכסון."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "הקובץ הועלה באופן חלקי בלבד"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "שום קובץ לא הועלה"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "תקיה זמנית חסרה"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "איש קשר"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,104 +300,209 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
-msgstr ""
+msgstr "ספר כתובות לא נמצא"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "הודעה"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "אינטרנט"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "יום הולדת"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:182
+msgid "Call"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "איש קשר"
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "יום ההולדת של {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "הוספת איש קשר"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "יבא"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "פנקסי כתובות"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "הגדר ספרי כתובות"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "פנקס כתובות חדש"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "קישור "
@@ -460,185 +516,194 @@ msgid "Edit"
 msgstr "עריכה"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "הורדת איש קשר"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "גרור ושחרר תמונה בשביל להעלות"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "מחיקת איש קשר"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "מחק תמונה נוכחית"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "ערוך תמונה נוכחית"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "העלה תמונה חדשה"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "בחר תמונה מ ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "ערוך פרטי שם"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
+msgstr "כינוי"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
+msgstr "הכנס כינוי"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "יום הולדת"
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
-msgstr ""
+msgstr "קבוצות"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "הפרד קבוצות עם פסיקים"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "ערוך קבוצות"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "מועדף"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "אנא הזן כתובת דוא\"ל חוקית"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
-msgstr ""
+msgstr "הזן כתובת דוא\"ל"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
-msgstr ""
+msgstr "כתובת"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "מחק כתובת דוא\"ל"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "הכנס מספר טלפון"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "מחק מספר טלפון"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "ראה במפה"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "ערוך פרטי כתובת"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "הוסף הערות כאן."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
+msgstr "הוסף שדה"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "טלפון"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
+msgstr "הערה"
 
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "הורדת איש קשר"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "מחיקת איש קשר"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "ערוך כתובת"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "סוג"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "תא דואר"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "מורחב"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "רחוב"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "עיר"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "אזור"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "מיקוד"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "מדינה"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "הוספה"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "מדינה"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -646,79 +711,79 @@ msgstr "פנקס כתובות"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "קידומות שם"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "גב'"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "גב'"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "מר'"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "אדון"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "גב'"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "ד\"ר"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "שם"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "שמות נוספים"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "שם משפחה"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "סיומות שם"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,77 +810,69 @@ msgid "Submit"
 msgstr "ביצוע"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "ביטול"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+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"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "שם ספר כתובות החדש"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "מיבא אנשי קשר"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "איך לך אנשי קשר בספר הכתובות"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "הוסף איש קשר"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "הגדר ספרי כתובות"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "more info"
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "CardDAV מסנכרן כתובות"
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr "מידע נוסף"
+
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "כתובת ראשית"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 4d10be3cda2958a06e0013439c0da9124ad43f04..caacbd7897e6385f282c7a8815fc66ef80f67568 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ido.parag@gmail.com>, 2012.
 #   <tomerc+transifex.net@gmail.com>, 2011.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/owncloud/language/he/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,83 +36,87 @@ msgstr "קטגוריה זאת כבר קיימת: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
-msgid "January"
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "הגדרות"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
+msgid "January"
+msgstr "ינואר"
+
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "פברואר"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "מרץ"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "אפריל"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "מאי"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "יוני"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "יולי"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "אוגוסט"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "ספטמבר"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "אוקטובר"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "נובמבר"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "דצמבר"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "ביטול"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "לא"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "כן"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "בסדר"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "לא נבחרו קטגוריות למחיקה"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "שגיאה"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "איפוס הססמה של ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
@@ -241,14 +246,10 @@ msgstr "סיום התקנה"
 msgid "web services under your control"
 msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "הגדרות"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index a690a80bc3a49501e4f217594ec73115fe77b6e4..760821f2eb6b5c98a4435c79ca932817804f9346 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "יוצר קובץ ZIP, אנא המתן."
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 14ede506d8cdb6af37cddf22ff30b20f21ffe319..52acf5ffa15ca0db33c7b29c29899922468604dc 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -3,106 +3,102 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011.
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
 # Domagoj Delimar <transifex.net@domdelimar.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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\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"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Pogreška pri (de)aktivaciji adresara."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
+msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "naziv elementa nije postavljen."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id nije postavljen."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
-msgstr ""
+msgstr "Prazno svojstvo se ne može dodati."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
-msgstr ""
+msgstr "Morate ispuniti barem jedno od adresnih polja."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Pokušali ste dodati duplo svojstvo:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "Nema dodijeljenog ID identifikatora"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Pogreška pri postavljanju checksuma."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Niti jedna kategorija nije odabrana za brisanje."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Nema adresara."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Nema kontakata."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "Nedostupan ID identifikator"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
+msgstr "Pogreška pri raščlanjivanju VCard za ID:"
 
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "ID kontakta nije podnešen."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Pogreška pri čitanju kontakt fotografije."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Pogreška pri spremanju privremene datoteke."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Fotografija nije valjana."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -110,233 +106,187 @@ msgstr "Informacija o vCard je neispravna. Osvježite stranicu."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Pogreška pri brisanju svojstva kontakta."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "ID kontakta nije dostupan."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Putanja do fotografije nije podnešena."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Datoteka ne postoji:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Pogreška pri učitavanju slike."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "checksum nije postavljen."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Nešto je otišlo... krivo..."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Pogreška pri ažuriranju adresara."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Pogreška pri slanju kontakata."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Nema pogreške, datoteka je poslana uspješno."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Poslana datoteka je parcijalno poslana"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Datoteka nije poslana"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Nedostaje privremeni direktorij"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,104 +299,209 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Adresar nije pronađen."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:182
+msgid "Call"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} Rođendan"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Uvezi"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresari"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfiguracija Adresara"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav poveznica"
@@ -460,186 +515,195 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Preuzmi kontakt"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Dovucite fotografiju za slanje"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Izbriši kontakt"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr "Uredi trenutnu sliku"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Uredi detalje imena"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Unesi nadimank"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Rođendan"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Uredi grupe"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
-msgstr ""
+msgstr "Preferirano"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Unesi email adresu"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Unesi broj telefona"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Prikaži na karti"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Uredi detalje adrese"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Dodaj bilješke ovdje."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Bilješka"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Uredi trenutnu sliku"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Preuzmi kontakt"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Izbriši kontakt"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Uredi adresu"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tip"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Poštanski Pretinac"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Prošireno"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Grad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poštanski broj"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Država"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Uredi kategorije"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresar"
@@ -730,11 +794,11 @@ msgstr "Uredi adresar"
 
 #: templates/part.editaddressbook.php:12
 msgid "Displayname"
-msgstr ""
+msgstr "Prikazani naziv"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "Pošalji"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Prekini"
 
@@ -765,33 +828,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Uvezi"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index fb3ceb080831854411102caf36177bed45bc9763..48308caf0559b3dba87dcb2305fa8c5a8b86b3b5 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011.
+# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
 # Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
 # Thomas Silađi <thomas.siladi@net.hr>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/owncloud/language/hr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Ova kategorija već postoji: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Postavke"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nema odabranih kategorija za brisanje."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Pogreška"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "ownCloud resetiranje lozinke"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
 
@@ -242,14 +246,10 @@ msgstr "Završi postavljanje"
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Postavke"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index f94c9ee4bcf27725b9c524ef7eab24f421f61b97..2cd29927c8ef4f17ea1531446a4b03beeceeaa97 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Briši"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generiranje ZIP datoteke, ovo može potrajati."
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index bff0548d69cef97e46b3068e5f7aaab4c92ebcf7..f524421d03a1fd3d47a9751e9ddbf0556a49e6be 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,101 +11,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\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"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Címlista (de)aktiválása sikertelen"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Hiba a kapcsolat hozzáadásakor"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "az elem neve nincs beállítva"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID nincs beállítva"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nem adható hozzá üres tulajdonság"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Legalább egy címmező kitöltendő"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Hiba a kapcsolat-tulajdonság hozzáadásakor"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nincs ID megadva"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Hiba az ellenőrzőösszeg beállításakor"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nincs kiválasztva törlendő kategória"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nem található címlista"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nem található kontakt"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Hiányzó ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "VCard elemzése sikertelen a következő ID-hoz: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nem adható hozzá névtelen címlista"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Hiba a címlista hozzáadásakor"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Címlista aktiválása sikertelen"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nincs ID megadva a kontakthoz"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "A kontakt képének beolvasása sikertelen"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Ideiglenes fájl mentése sikertelen"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "A kép érvénytelen"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID nincs beállítva"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
@@ -114,328 +110,391 @@ msgstr "A vCardról szóló információ helytelen. Töltsd újra az oldalt."
 msgid "Error deleting contact property."
 msgstr "Hiba a kapcsolat-tulajdonság törlésekor"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Hiányzik a kapcsolat ID"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Hiányzik a kontakt ID"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nincs fénykép-útvonal megadva"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "A fájl nem létezik:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Kép betöltése sikertelen"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "A kontakt-objektum feldolgozása sikertelen"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "A PHOTO-tulajdonság  feldolgozása sikertelen"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "A kontakt mentése sikertelen"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Képméretezés sikertelen"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Képvágás sikertelen"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "az elem neve nincs beállítva"
+msgstr "A kép nem található"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "az ellenőrzőösszeg nincs beállítva"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Helytelen információ a vCardról. Töltse újra az oldalt: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Valami balul sült el."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Üres névvel nem frissíthető a címlista"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Hiba a címlista frissítésekor"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Hiba a kapcsolatok feltöltésekor"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nincs hiba, a fájl sikeresen feltöltődött"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a HTML form-ban megadott MAX_FILE_SIZE értéket"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "A fájl csak részlegesen lett feltöltve"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nincs feltöltött fájl"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Hiányzik az ideiglenes könyvtár"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Ideiglenes kép létrehozása sikertelen"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Ideiglenes kép betöltése sikertelen"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Sajnáljuk, ez a funkció még nem támogatott"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Nem támogatott"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Érvényes cím lekérése sikertelen"
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Hiba"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kapcsolat"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Ezt a tulajdonságot muszáj kitölteni"
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Név szerkesztése"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Húzza ide a VCF fájlt a kapcsolatok importálásához"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Típus kiválasztása"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Eredmény: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "  beimportálva,  "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "  sikertelen"
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Címlista nem található"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Szervezet"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Születésnap"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name} születésnapja"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kapcsolat hozzáadása"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Címlisták"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Bezár"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Címlisták beállítása"
@@ -444,11 +503,7 @@ msgstr "Címlisták beállítása"
 msgid "New Address Book"
 msgstr "Új címlista"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importálás VCF-ből"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav hivatkozás"
@@ -462,186 +517,195 @@ msgid "Edit"
 msgstr "Szerkesztés"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Kapcsolat letöltése"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Húzza ide a feltöltendő képet"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kapcsolat törlése"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Aktuális kép törlése"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Húzza ide a feltöltendő képet"
+msgid "Edit current photo"
+msgstr "Aktuális kép szerkesztése"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Új kép feltöltése"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Kép kiválasztása ownCloud-ból"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Név részleteinek szerkesztése"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Becenév"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Becenév megadása"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Születésnap"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Vesszővel válassza el a csoportokat"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Csoportok szerkesztése"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Előnyben részesített"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Adjon meg érvényes email címet"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Adja meg az email címet"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Postai cím"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Email cím törlése"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Adja meg a telefonszámot"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Telefonszám törlése"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Megtekintés a térképen"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Cím részleteinek szerkesztése"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Megjegyzések"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Mező hozzáadása"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilkép"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonszám"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Jegyzet"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Aktuális kép törlése"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Aktuális kép szerkesztése"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Új kép feltöltése"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kapcsolat letöltése"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Kép kiválasztása ownCloud-ból"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kapcsolat törlése"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Az ideiglenes kép el lett távolítva a gyorsítótárból"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Cím szerkesztése"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Típus"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postafiók"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Kiterjesztett"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Utca"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Város"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Megye"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Irányítószám"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Ország"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategóriák szerkesztése"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Hozzáad"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Címlista"
@@ -747,7 +811,6 @@ msgid "Submit"
 msgstr "Elküld"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -767,33 +830,10 @@ msgstr "Címlista létrehozása"
 msgid "Name of new addressbook"
 msgstr "Új címlista neve"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Kapcsolatok importálása"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Melyik címlistába történjen az importálás:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Kiválasztás merevlemezről"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nincsenek kapcsolatok a címlistában"
@@ -806,18 +846,34 @@ msgstr "Kapcsolat hozzáadása"
 msgid "Configure addressbooks"
 msgstr "Címlisták beállítása"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV szinkronizációs címek"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "további információ"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Elsődleges cím"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 7aba93b9727f308c73fdc65f9531eb153f808cff..a40b764ad40b0fae33233c8526dcf7b455909fe2 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,10 +10,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/owncloud/language/hu_HU/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Ez a kategória már létezik"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Beállítások"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Január"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Február"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Március"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Április"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Május"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Június"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Július"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Augusztus"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Szeptember"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Október"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nem"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Igen"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nincs törlésre jelölt kategória"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Hiba"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "ownCloud jelszó-visszaállítás"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
 
@@ -126,7 +130,7 @@ msgstr "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
-msgstr "Kért"
+msgstr "Kérés elküldve"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
@@ -135,7 +139,7 @@ msgstr "Belépés sikertelen!"
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
 #: templates/login.php:9
 msgid "Username"
-msgstr "Felhasználói név"
+msgstr "Felhasználónév"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request reset"
@@ -143,7 +147,7 @@ msgstr "Visszaállítás igénylése"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Jelszó megváltoztatásra került"
+msgstr "Jelszó megváltoztatva"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -155,7 +159,7 @@ msgstr "Új jelszó"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Jelszó beállítás"
+msgstr "Jelszó-visszaállítás"
 
 #: strings.php:5
 msgid "Personal"
@@ -171,7 +175,7 @@ msgstr "Alkalmazások"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Adminisztráció"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -183,7 +187,7 @@ msgstr "Hozzáférés tiltva"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Nem talált felhő"
+msgstr "A felhő nem található"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -195,7 +199,7 @@ msgstr "Hozzáadás"
 
 #: templates/installation.php:23
 msgid "Create an <strong>admin account</strong>"
-msgstr "<strong>Adminisztrációs fiók</strong> létrehozása"
+msgstr "<strong>Rendszergazdafiók</strong> létrehozása"
 
 #: templates/installation.php:29 templates/login.php:13
 msgid "Password"
@@ -203,11 +207,11 @@ msgstr "Jelszó"
 
 #: templates/installation.php:35
 msgid "Advanced"
-msgstr "Fejlett"
+msgstr "Haladó"
 
 #: templates/installation.php:37
 msgid "Data folder"
-msgstr "Adat könyvtár"
+msgstr "Adatkönyvtár"
 
 #: templates/installation.php:44
 msgid "Configure the database"
@@ -220,7 +224,7 @@ msgstr "használva lesz"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Adatbázis felhasználó"
+msgstr "Adatbázis felhasználónév"
 
 #: templates/installation.php:86
 msgid "Database password"
@@ -236,27 +240,23 @@ msgstr "Adatbázis szerver"
 
 #: templates/installation.php:101
 msgid "Finish setup"
-msgstr "Beállítások befejezése"
+msgstr "Beállítás befejezése"
 
 #: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webszolgáltatások az irányításod alatt"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Beállítások"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Elfelejtett jelszó?"
 
 #: templates/login.php:17
 msgid "remember"
-msgstr "emlékezni"
+msgstr "emlékezzen"
 
 #: templates/login.php:18
 msgid "Log in"
@@ -264,7 +264,7 @@ msgstr "Bejelentkezés"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "Kilépés sikerült."
+msgstr "Kilépett."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index a7826f3be534fc92ae326c86b7ccc674529adadf..afa43a50361feffd0a54d53c02183cca363cebb4 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 824bab0c47de84b1aa7efc0ab8200756f7f3659a..8916c610f80e635d4b7df48af657c7a77e404b8b 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/contacts.po
@@ -7,101 +7,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: templates/index.php:13
-msgid "Add Contact"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
 msgstr ""
 
 #: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,184 +513,193 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
 msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
-msgid "Zipcode"
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
 msgstr ""
 
 #: templates/part.edit_name_dialog.php:16
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 0880df331a417b8ed600b1ac5ab271dc6847a3ef..f7c8e7693a4e98cce7cec463ae76c3e8bb6e28f3 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,10 +7,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Armenian (http://www.transifex.net/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -106,10 +114,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -239,14 +243,10 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index a89c7b0efedef6e3fb40ca4e91e0b056dab87b77..596ee3266019bd7db3e4a1bb8628027cacf4ab6a 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index 7c0c0d4b01672a6170b5f965d2fcfbb42384acf1..d41fa3c8fa0d7836a3817c5376e4b51d8cb8ea27 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,101 +9,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\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"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Non pote adder proprietate vacue."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nulle adressario trovate"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nulle contactos trovate."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Error durante que il addeva le adressario."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Error in activar adressario"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Error durante le scriptura in le file temporari"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -112,231 +108,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Il habeva un error durante le cargamento del imagine."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,91 +299,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adressario non trovate."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Anniversario"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contacto"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adder contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressarios"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -442,11 +501,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Nove adressario"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Ligamine CardDav"
@@ -460,186 +515,195 @@ msgid "Edit"
 msgstr "Modificar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Discargar contacto"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Deler contacto"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Deler photo currente"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "Modificar photo currente"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Incargar nove photo"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Seliger photo ex ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Pseudonymo"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Inserer pseudonymo"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Anniversario"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Modificar gruppos"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferite"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Entrar un adresse de e-posta"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Deler adresse de E-posta"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Entrar un numero de telephono"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Deler numero de telephono"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Vider in un carta"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Adder notas hic"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Adder campo"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Imagine de profilo"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Phono"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Deler photo currente"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Modificar photo currente"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Incargar nove photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Discargar contacto"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Seliger photo ex ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Deler contacto"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Modificar adresses"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Cassa postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extendite"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Strata"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Citate"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Codice postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Pais"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Modificar categorias"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adder"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressario"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "Submitter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -765,33 +828,10 @@ msgstr "Crear un nove adressario"
 msgid "Name of new addressbook"
 msgstr "Nomine del nove gruppo:"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr "Adder adressario"
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "plus info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index e81a57a40bc71d5dd13a00951e10703316db42b5..fe4466de6b043f5c0f1bb7624367ce0e944e370b 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.net/projects/p/owncloud/language/ia/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr "Iste categoria jam existe:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Configurationes"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reinitialisation del contrasigno de Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
 
@@ -240,14 +244,10 @@ msgstr ""
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Configurationes"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index ac35031953a7e9b9e872e8b98be660471f709e22..5e995f4fbf0b4867d24e6c504bdd1fa06d8495ef 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Deler"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 0a3d9aab362bd3fec3066cc33e99d085413bb2eb..46c23dd903f54ff56ef6d150daa97bfaa18dc28e 100644
--- a/l10n/id/contacts.po
+++ b/l10n/id/contacts.po
@@ -7,101 +7,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -110,231 +106,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -347,91 +297,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: templates/index.php:13
-msgid "Add Contact"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
 msgstr ""
 
 #: templates/index.php:14
+msgid "Add Contact"
+msgstr ""
+
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -440,11 +499,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -458,184 +513,193 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr ""
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
 msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
-msgid "Zipcode"
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
+#: templates/part.edit_address_dialog.php:48
+msgid "Zipcode"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
 msgstr ""
 
 #: templates/part.edit_name_dialog.php:16
@@ -743,7 +807,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -763,33 +826,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -802,18 +842,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 04caad7d3177cc77afb9fc468ce8efab37e0d7c5..dbfdf23312651af0cbba75f93045fcee268e12f7 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/language/id/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,51 +35,59 @@ msgstr "Kategori ini sudah ada:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Setelan"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -108,10 +116,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reset password Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "reset password ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "Selesaikan instalasi"
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Setelan"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Lupa password anda?"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 266e210ae27c979ab860f52934fac7d73ad7776c..8b632afd5067f3751deabe45b7f55db96c287b94 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 6bbcb889ca03c1735ca01a4752978198adf6b560..0efd77c3ec3f5a81b7c5406c2f58f9c2e350a45a 100644
--- a/l10n/id_ID/contacts.po
+++ b/l10n/id_ID/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\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"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 2a3c3b516c8987008c6bd648e58f3d388cb7f85c..1434c85e1d88aa331549c2416a364aa8ae4ce4f1 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_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"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index 80f24e91fe413aae991df334fa13e8f8a10d1038..cc6601b9fafc4b7b7f37c7f2b2d1b78c16d5698d 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_ID/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/it/bookmarks.po b/l10n/it/bookmarks.po
index 501cb1181cb70667c59fdbb1c8f25bd78392750a..7ed1ded6a77cab558984ec1000347462424cc276 100644
--- a/l10n/it/bookmarks.po
+++ b/l10n/it/bookmarks.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-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 08:36+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,42 +20,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Segnalibri"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "senza nome"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Leggi dopo"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titolo"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Tag"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Salva segnalibro"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Non hai segnalibri"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bookmarklet <br />"
diff --git a/l10n/it/calendar.po b/l10n/it/calendar.po
index 67fa300db84eb4f553b5f91534064b2b680a0595..52db292ae4f110842c2d7879d014e8efd63bc04f 100644
--- a/l10n/it/calendar.po
+++ b/l10n/it/calendar.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 20:45+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 12:15+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"
@@ -83,19 +83,19 @@ msgstr "Calendario"
 
 #: js/calendar.js:828
 msgid "ddd"
-msgstr "ggg"
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr "ggg M/g"
+msgstr "ddd d/M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr "gggg M/g"
+msgstr "dddd d/M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr "MMMM aaaa"
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -103,7 +103,7 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr "gggg, MMM g, aaaa"
+msgstr "dddd, d MMM yyyy"
 
 #: lib/app.php:121
 msgid "Birthday"
@@ -604,7 +604,7 @@ msgstr "Categoria"
 
 #: templates/part.eventform.php:29
 msgid "Separate categories with commas"
-msgstr "Categorie separate con virgole"
+msgstr "Categorie separate da virgole"
 
 #: templates/part.eventform.php:30
 msgid "Edit categories"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index 64b9e1e0a164d784c6e438891ee9e5dbf9b115fe..39aa2c960f7e3602102983e457eee3bd16791436 100644
--- a/l10n/it/contacts.po
+++ b/l10n/it/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-07-26 02:01+0200\n"
-"PO-Revision-Date: 2012-07-25 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\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"
 "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"
@@ -85,20 +85,20 @@ msgstr "ID mancante"
 msgid "Error parsing VCard for ID: \""
 msgstr "Errore in fase di elaborazione del file VCard per l'ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nessun ID di contatto inviato."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Errore di lettura della foto del contatto."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Errore di salvataggio del file temporaneo."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La foto caricata non è valida."
 
@@ -126,31 +126,31 @@ msgstr "Il file non esiste:"
 msgid "Error loading image."
 msgstr "Errore di caricamento immagine."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Errore di recupero dell'oggetto contatto."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Errore di recupero della proprietà FOTO."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Errore di salvataggio del contatto."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Errore di ridimensionamento dell'immagine"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Errore di ritaglio dell'immagine"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Errore durante la creazione dell'immagine temporanea"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Errore durante la ricerca dell'immagine: "
 
@@ -182,110 +182,110 @@ msgstr "Errore durante l'aggiornamento della rubrica."
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato inviato correttamente"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Il file inviato supera la direttiva upload_max_filesize nel php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato inviato solo parzialmente"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nessun file è stato inviato"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Impossibile salvare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Impossibile caricare l'immagine temporanea: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contatti"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Non implementata"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contatto"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nuovo"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
@@ -301,129 +301,129 @@ msgstr " importato, "
 msgid " failed."
 msgstr " non riuscito."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Rubrica non trovata."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Domande"
 
@@ -431,63 +431,67 @@ msgstr "Domande"
 msgid "{name}'s Birthday"
 msgstr "Data di nascita di {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importa"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Rubriche"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Contatto successivo in elenco"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contatto precedente in elenco"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Espandi/Contrai la rubrica corrente"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Rubrica successiva/precedente"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Aggiorna l'elenco dei contatti"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Aggiungi una nuova rubrica"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Elimina il contatto corrente"
 
@@ -854,22 +858,22 @@ msgstr "Inserisci il nome"
 msgid "Enter description"
 msgstr "Inserisci una descrizione"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Indirizzi di sincronizzazione CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "altre informazioni"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Indirizzo principale (Kontact e altri)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Collegamento(i) cartella vCard sola lettura"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index c2d63be3c9744745ef9c20da0d9167a60092d944..facb1d047d58d800e1f93a326e69d6dac021c5a3 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,10 +12,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/language/it/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,85 +36,89 @@ msgstr "Questa categoria esiste già: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sì"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nessuna categoria selezionata per l'eliminazione."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ripristino password di Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
 
@@ -244,14 +248,10 @@ msgstr "Termina la configurazione"
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Impostazioni"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index ae00b01ac9bfa27fb8911b12c9b30b6f64885c9f..aefaa88ad205c3673ddcca2cfe5f7f5116e03b33 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr "Rimuovi condivisione"
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "annulla"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "eliminati"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "creazione file ZIP, potrebbe richiedere del tempo."
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index f930daa0b6e075bb23f39c10846de2321adda12c..e34db2db96ec9a417f8ae633c12395f5d6aa812b 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.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-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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 10:25+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,94 +20,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Aiuto"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personale"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Impostazioni"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Applicazioni"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "I file devono essere scaricati uno alla volta."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Torna ai file"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "L'applicazione  non è abilitata"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Errore di autenticazione"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token scaduto. Ricarica la pagina."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "secondi fa"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minuto fa"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minuti fa"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "oggi"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "ieri"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d giorni fa"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "il mese scorso"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "mesi fa"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "l'anno scorso"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "anni fa"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index f48c9cc75bc8269f828cc4ed4015af56a576799d..1f8cbc10ecf8574a753c10b85ae6db13a1c23a3b 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "アドレスブックの有効/無効化に失敗しました。"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "連絡先の追加でエラーが発生しました。"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "要素名が設定されていません。"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "idが設定されていません。"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "項目の新規追加に失敗しました。"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "住所の項目のうち1つは入力して下さい。"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "重複する属性を追加: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "連絡先の追加に失敗しました。"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "IDが提供されていません"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "チェックサムの設定エラー。"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "削除するカテゴリが選択されていません。"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "アドレスブックが見つかりません。"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "連絡先が見つかりません。"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "VCardからIDの抽出エラー: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "名前を空白にしたままでアドレスブックを追加することはできません。"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "アドレスブックの追加に失敗しました。"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "アドレスブックの有効化に失敗しました。"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "連絡先IDは登録されませんでした。"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "連絡先写真の読み込みエラー。"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "一時ファイルの保存エラー。"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "写真の読み込みは無効です。"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "idが設定されていません。"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCardの情報に誤りがあります。ページをリロードして下さい。"
@@ -111,328 +107,391 @@ msgstr "vCardの情報に誤りがあります。ページをリロードして
 msgid "Error deleting contact property."
 msgstr "連絡先の削除に失敗しました。"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "コンタクトIDが見つかりません。"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "コンタクトIDが設定されていません。"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "写真のパスが登録されていません。"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "ファイルが存在しません:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "画像の読み込みエラー。"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "コンタクトオブジェクトの取得エラー。"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "写真属性の取得エラー。"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "コンタクトの保存エラー。"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "画像のリサイズエラー"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "画像の切り抜きエラー"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "一時画像の生成エラー"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "要素名が設定されていません。"
+msgstr "画像検索エラー: "
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "チェックサムが設定されていません。"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCardの情報が正しくありません。ページを再読み込みしてください: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "連絡先の更新に失敗しました。"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "空白の名前でアドレスブックを更新することはできません。"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "アドレスブックの更新に失敗しました。"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "ストレージへの連絡先のアップロードエラー。"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "一時保存フォルダが見つかりません"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "一時的な画像の保存ができませんでした: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "一時的な画像の読み込みができませんでした: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "連絡先"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "申し訳ありません。この機能はまだ実装されていません"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "未実装"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "有効なアドレスを取得できませんでした。"
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "エラー"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "連絡先"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "この属性は空にできません。"
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "名前を編集"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。"
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "連絡先をインポートするVCFファイルをドロップしてください。"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "タイプを選択"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "結果: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " をインポート、 "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " は失敗しました。"
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "アドレスブックが見つかりませんでした。"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "これはあなたの電話帳ではありません。"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "住所"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "電話番号"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "インターネット"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "誕生日"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}の誕生日"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "連絡先"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "連絡先の追加"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "インポート"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "電話帳"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "閉じる"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "アドレスブックを設定"
@@ -441,11 +500,7 @@ msgstr "アドレスブックを設定"
 msgid "New Address Book"
 msgstr "新規電話帳"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCFからインポート"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAVリンク"
@@ -459,186 +514,195 @@ msgid "Edit"
 msgstr "編集"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "削除"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "連絡先のダウンロード"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "写真をドロップしてアップロード"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "連絡先の削除"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "現在の写真を削除"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "写真をドロップしてアップロード"
+msgid "Edit current photo"
+msgstr "現在の写真を編集"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "新しい写真をアップロード"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "ownCloudから写真を選択"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "名前の詳細を編集"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "ニックネームを入力"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "誕生日"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "コンマでグループを分割"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "グループを編集"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "推奨"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "連絡先を追加"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "メールアドレスを入力"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "アドレスへメールを送る"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "メールアドレスを削除"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "電話番号を入力"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "電話番号を削除"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "地図で表示"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "住所の詳細を編集"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "ここにメモを追加。"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "項目を追加"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "プロフィール写真"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "電話番号"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "メモ"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "現在の写真を削除"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "現在の写真を編集"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "新しい写真をアップロード"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "連絡先のダウンロード"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "ownCloudから写真を選択"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "連絡先の削除"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "一時画像はキャッシュから削除されました。"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "住所を編集"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "種類"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "私書箱"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "番地2"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "番地1"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "都市"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "都道府県"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "郵便番号"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "国名"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "カテゴリを編集"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "追加"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "アドレスブック"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "送信"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取り消し"
 
@@ -764,33 +827,10 @@ msgstr "新しいアドレスブックを作成"
 msgid "Name of new addressbook"
 msgstr "新しいアドレスブックの名前"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "インポート"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "コンタクトをインポート"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "インポートするアドレスブックを選択:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "HDから選択"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "アドレスブックに連絡先が登録されていません。"
@@ -803,18 +843,34 @@ msgstr "連絡先を追加"
 msgid "Configure addressbooks"
 msgstr "アドレス帳を設定"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV同期アドレス"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "詳細情報"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "プライマリアドレス(Kontact 他)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index f0a07c435ac1e96f23b9e018e3bb954b7d5f2587..6aa6c326c5bc09eff3866618506c148e4dfe510a 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.net/projects/p/owncloud/language/ja_JP/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +32,89 @@ msgstr "このカテゴリはすでに存在します: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "設定"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "1月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "2月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "3月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "4月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "5月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "6月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "7月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "8月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "9月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "10月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "11月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "いいえ"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "はい"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "削除するカテゴリが選択されていません。"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud のパスワードをリセット"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
 
@@ -240,14 +244,10 @@ msgstr "セットアップを完了します"
 msgid "web services under your control"
 msgstr "管理下にあるウェブサービス"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "設定"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか?"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 9be02066dbb706dc4fa0a32e2888834af097d492..e014bfa99f3b169041a023c122b447d164b2bbe2 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "削除"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 77bb4f1a3986d50bb72e43cad5756932bb9d3160..3d9e441fab3656461b575306fdef0fb479277d56 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,101 +9,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "주소록을 (비)활성화하는 데 실패했습니다."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "element 이름이 설정되지 않았습니다."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "아이디가 설정되어 있지 않습니다. "
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "빈 속성을 추가할 수 없습니다."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "최소한 하나의 주소록 항목을 입력해야 합니다."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "중복 속성 추가 시도: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "연락처 속성을 추가할 수 없습니다."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "제공되는 아이디 없음"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "오류 검사합계 설정"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "삭제 카테고리를 선택하지 않았습니다. "
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "주소록을 찾을 수 없습니다."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "아이디 분실"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "성명란이 비어 주소록에 추가 할 수 없습니다."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "주소록을 추가할 수 없습니다."
+msgstr "아이디에 대한 VCard 분석 오류"
 
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "주소록을 활성화할 수 없습니다."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "접속 아이디가 기입되지 않았습니다."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "사진 읽기 오류"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "임시 파일을 저장하는 동안 오류가 발생했습니다. "
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "로딩 사진이 유효하지 않습니다. "
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "아이디가 설정되어 있지 않습니다. "
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십시오."
@@ -112,328 +108,391 @@ msgstr "vCard 정보가 올바르지 않습니다. 페이지를 새로 고치십
 msgid "Error deleting contact property."
 msgstr "연락처 속성을 삭제할 수 없습니다."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "접속 아이디가 없습니다. "
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "접속 아이디 분실"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "사진 경로가 제출되지 않았습니다. "
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "파일이 존재하지 않습니다. "
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "로딩 이미지 오류입니다."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "연락처 개체를 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "사진 속성을 가져오는 중 오류가 발생했습니다. "
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "연락처 저장 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "이미지 크기 조정 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "이미지를 자르던 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "임시 이미지를 생성 중 오류가 발생했습니다."
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
+msgstr "이미지를 찾던 중 오류가 발생했습니다:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "체크섬이 설정되지 않았습니다."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "연락처 속성을 업데이트할 수 없습니다."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "주소록을 업데이트할 수 없습니다."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "스토리지 에러 업로드 연락처."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "오류없이 파일업로드 성공."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "php.ini 형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "HTML형식으로 업로드 된 이 파일은 MAX_FILE_SIZE를 초과하였다."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "이 업로드된 파일은 부분적으로만 업로드 되었습니다."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "파일이 업로드 되어있지 않습니다"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "임시 폴더 분실"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "임시 이미지를 저장할 수 없습니다:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "임시 이미지를 불러올 수 없습니다. "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "연락처"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "죄송합니다. 이 기능은 아직 구현되지 않았습니다. "
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "구현되지 않음"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "유효한 주소를 얻을 수 없습니다."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "오류"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "연락처"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "이름 편집"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "이 파일은 이 서버 파일 업로드 최대 용량을 초과 합니다. "
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "유형 선택"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "결과:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "불러오기,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "실패."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "주소록을 찾을 수 없습니다."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "내 주소록이 아닙니다."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "주소"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "전화 번호"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "전자 우편"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "조직"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "휴대폰"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "문자 번호"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "음성 번호"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "메세지"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "팩스 번호"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "영상 번호"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "호출기"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "인터넷"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "생일"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{이름}의 생일"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "연락처"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "연락처 추가"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "입력"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "주소록"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "닫기"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "주소록 구성"
@@ -442,11 +501,7 @@ msgstr "주소록 구성"
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCF에서 가져오기"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav 링크"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "편집"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "연락처 다운로드"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Drop photo to upload"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "연락처 삭제"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "현재 사진 삭제"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Drop photo to upload"
+msgid "Edit current photo"
+msgstr "현재 사진 편집"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "새로운 사진 업로드"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "ownCloud에서 사진 선택"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Format custom, Short name, Full name, Reverse or Reverse with comma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "이름 세부사항을 편집합니다. "
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "별명"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "별명 입력"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "생일"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "일-월-년"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "쉼표로 그룹 구분"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "그룹 편집"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "선호함"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "올바른 이메일 주소를 입력하세요."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "이메일 주소 입력"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "이메일 주소 삭제"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "전화번호 입력"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "전화번호 삭제"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "지도에서 보기"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "상세 주소 수정"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "여기에 노트 추가."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
+msgstr "파일 추가"
 
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "전화 번호"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
+msgstr "노트"
 
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "연락처 다운로드"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "연락처 삭제"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "임시 이미지가 캐시에서 제거 되었습니다. "
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "주소 수정"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "종류"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "사서함"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "확장"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "거리"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "도시"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "지역"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "우편 번호"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "국가"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "추가"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "국가"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -646,79 +710,79 @@ msgstr "주소록"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Hon. prefixes"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Miss"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Ms"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Mr"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mrs"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Given name"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "추가 이름"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "성"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Hon. suffixes"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,77 +809,69 @@ msgid "Submit"
 msgstr "보내기"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "취소"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+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"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "새 주소록 이름"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "연락처 입력"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "당신의 주소록에는 연락처가 없습니다. "
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "연락처 추가"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "주소록 구성"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "more info"
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "CardDAV 주소 동기화"
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr "더 많은 정보"
+
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "기본 주소 (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 22330d05c9e43e585956bbd333d2edb4d1c1d120..948625d1cced0970786f45cc16db6e04bad90051 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/owncloud/language/ko/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "이 카테고리는 이미 존재합니다:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "설정"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "1월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "2월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "3월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "4월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "5월"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "6월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "7월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "8월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "9월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "10월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "11월"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "12월"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "취소"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "아니오"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "예"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "승락"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "삭제 카테고리를 선택하지 않았습니다."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "에러"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud 암호 재설정"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud 비밀번호 재설정"
 
@@ -241,14 +245,10 @@ msgstr "설치 완료"
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "설정"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index ff96bf8195d0111554a579c8bba172e070ec23d4..76eb1bf66dda68d24408be47c7a0b0e9c75a5406 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "삭제"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index 752a81e3f792f9d8b055f18ec058b98af93250ed..fe4a8a044e5e5095be7cb48a0de024edfa6ac8c7 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/contacts.po
@@ -8,100 +8,96 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\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"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
-msgstr ""
+msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
+msgstr "Fehler beim bäisetzen vun engem Kontakt."
+
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:40
-msgid "Cannot add empty property."
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID ass net gesat."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:56
+msgid "Cannot add empty property."
+msgstr "Ka keng eidel Proprietéit bäisetzen."
+
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "Keng ID uginn"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Fehler beim setzen vun der Checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Keng Kategorien fir ze läschen ausgewielt."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Keen Adressbuch fonnt."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Keng Kontakter fonnt."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "ID fehlt"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Kontakt ID ass net mat geschéckt ginn."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Fehler beim liesen vun der Kontakt Photo."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Fehler beim späicheren vum temporäre Fichier."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Déi geluede Photo ass net gülteg."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -109,343 +105,402 @@ msgstr "Informatioun iwwert vCard ass net richteg. Lued d'Säit wegl nei."
 
 #: ajax/deleteproperty.php:43
 msgid "Error deleting contact property."
-msgstr ""
+msgstr "Fehler beim läschen vun der Kontakt Proprietéit."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
-
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
+msgstr "Kontakt ID fehlt."
 
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "Fichier existéiert net:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Fehler beim lueden vum Bild."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
-msgstr ""
+msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
-msgstr ""
+msgstr "Fehler beim updaten vum Adressbuch."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Et ass kee Fichier ropgeluede ginn"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakter"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultat: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " importéiert, "
 
 #: js/loader.js:49
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Adressbuch net fonnt."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Message"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Gebuertsdag"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:182
+msgid "Call"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name} säi Gebuertsdag"
 
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kontakt bäisetzen"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressbicher "
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zoumaachen"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Adressbicher konfigureiren"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Neit Adressbuch"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Link"
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Editéieren"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kontakt läschen"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
+msgstr "Spëtznumm"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
+msgstr "Gëff e Spëtznumm an"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Gebuertsdag"
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
-msgstr ""
+msgstr "Gruppen"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "Gruppen editéieren"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "Telefonsnummer aginn"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "Telefonsnummer läschen"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "Op da Kaart uweisen"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "Adress Detailer editéieren"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kontakt eroflueden"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kontakt läschen"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postleetzuel"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Erweidert"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Strooss"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Staat"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regioun"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postleetzuel"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Land"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dobäisetzen"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Land"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -657,31 +721,31 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "M"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Sir"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mme"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Virnumm"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Weider Nimm"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Famillje Numm"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
@@ -705,7 +769,7 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
@@ -713,11 +777,11 @@ msgstr ""
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -733,7 +797,7 @@ msgstr "Ugewisene Numm"
 
 #: templates/part.editaddressbook.php:23
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: templates/part.editaddressbook.php:29
 msgid "Save"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Fortschécken"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Ofbriechen"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 0304df227cd0f31d7981a469d2e8aae0d4a52f31..04a5957160afe8ecf9174d83a8928c975d3c05b1 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Luxembourgish (http://www.transifex.net/projects/p/owncloud/language/lb/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr "Des Kategorie existéiert schonn:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Astellungen"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud Passwuert reset"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud Passwuert reset"
 
@@ -240,14 +244,10 @@ msgstr "Installatioun ofschléissen"
 msgid "web services under your control"
 msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Ausloggen"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Astellungen"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index f2d900757604e3545791b0edc588ec21c5772975..23fcc1951456246d55f10e754a6ade69565b808e 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index 7191a75575405322d0c881c914d215b375b781f8..c6f544cbda57a01e6ad8e47f7ced978dc4edb4ae 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/contacts.po
@@ -8,100 +8,96 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\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"
+"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Klaida (de)aktyvuojant adresų knygą."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Pridedant kontaktą įvyko klaida."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Kontaktų nerasta."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Klaida pridedant adresų knygą."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Klaida aktyvuojant adresų knygą."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Klaida skaitant kontakto nuotrauką."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Netinkama įkeliama nuotrauka."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -111,231 +107,185 @@ msgstr "Informacija apie vCard yra neteisinga. "
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "Failas neegzistuoja:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Klaida įkeliant nuotrauką."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Failas įkeltas sėkmingai, be klaidų"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Įkeliamo failo dydis viršija upload_max_filesize nustatymą php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Nebuvo įkeltas joks failas"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontaktas"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,104 +298,209 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Nerasta adresų knyga."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Žinutė"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internetas"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Gimtadienis"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:182
+msgid "Call"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontaktas"
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridėti kontaktą"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresų knygos"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigūruoti adresų knygas"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAV nuoroda"
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Keisti"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Trinti"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Atsisųsti kontaktą"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Ištrinti kontaktą"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr ""
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
+msgstr "Slapyvardis"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Gimtadienis"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonas"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Atsisųsti kontaktą"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Ištrinti kontaktą"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipas"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Pašto dėžutė"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gatvė"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Miestas"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regionas"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Pašto indeksas"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Šalis"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Pridėti"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Šalis"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index c2bd15b3ef3dd9602e1f24768fa63da37c48e35f..3dfbbfaf40a510e2c0fce9073185abfead9528e3 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/owncloud/language/lt_LT/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "Nepateiktas programos pavadinimas."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Nepridėsite jokios kategorijos?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
@@ -32,85 +32,89 @@ msgstr "Tokia kategorija jau yra:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Sausis"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Vasaris"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Kovas"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Balandis"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Gegužė"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Birželis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Liepa"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Rugpjūtis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Rugsėjis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Spalis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Lapkritis"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Gruodis"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Taip"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Gerai"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Trynimui nepasirinkta jokia kategorija."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Klaida"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud slaptažodžio atkūrimas"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
 
@@ -240,14 +244,10 @@ msgstr "Baigti diegimą"
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nustatymai"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index a3f2ed1f7b6c748448f77a801ac73346dc8836f5..2eb293733caf17a85bfa6af774d434bc643a0e5c 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 8cc7933bb08eaef576a0f3d0be8cb354e39697ac..0b80baf9b44fe95e47eeda2c3b5141b1a77494f4 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-07-27 02:02+0200\n"
-"PO-Revision-Date: 2011-09-23 17:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "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"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index f9e9e23477e8ea649229558d657ab3804736757b..0c20b3c465125ddcd5eb43baeaea1dea00ecf029 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 12:27+0000\n"
-"Last-Translator: CPDZ <aldis@udris.lv>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Iestatījumi"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -240,10 +248,6 @@ msgstr ""
 msgid "Log out"
 msgstr "Izlogoties"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Iestatījumi"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 055364d0d73186a7319f71e22c669472693c4e03..621deceffc4de3c4be223896743999108deadbdd 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr "Pārtraukt līdzdalīšanu"
 msgid "Delete"
 msgstr "Izdzēst"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 6d30f17cb1df6743b95c15e85efcda9809d1a7d9..3af06736fa5f78191139db3e2c42ab0caa96c56c 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -3,106 +3,103 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\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"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Грешка (де)активирање на адресарот."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Имаше грешка при додавање на контактот."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "име за елементот не е поставена."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ид не е поставено."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Неможе да се додаде празна вредност."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Барем една од полињата за адреса треба да биде пополнето."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Се обидовте да внесете дупликат вредност:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Грешка при додавање на вредност за контактот."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Нема доставено ИД"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Грешка во поставување сума за проверка."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Нема избрано категории за бришење."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Не се најдени адресари."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Не се најдени контакти."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Недостасува ИД"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Грешка при парсирање VCard за ИД: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Неможе да се внесе адресар со празно име."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Грешки при додавање на адресарот."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Грешка при активирање на адресарот."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Не беше доставено ИД за контакт."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Грешка во читање на контакт фотографија."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Грешка во снимање на привремена датотека."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Фотографијата која се вчитува е невалидна."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ид не е поставено."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава."
@@ -111,328 +108,391 @@ msgstr "Информацијата за vCard не е точна. Ве мола
 msgid "Error deleting contact property."
 msgstr "Греш при бришење на вредноста за контакт."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ИД за контакт недостасува."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Недостасува ид за контакт."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Не беше поднесена патека за фотографија."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Не постои датотеката:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Грешка во вчитување на слика."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Грешка при преземањето на контакт објектот,"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Грешка при утврдувањето на карактеристиките на фотографијата."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Грешка при снимање на контактите."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Грешка при скалирање на фотографијата"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Грешка при сечење на фотографијата"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Грешка при креирањето на привремената фотографија"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "име за елементот не е поставена."
+msgstr "Грешка при наоѓањето на фотографијата:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "сумата за проверка не е поставена."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информацијата за vCard не е точна. Ве молам превчитајте ја страницава:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Нешто се расипа."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Грешка при ажурирање на вредноста за контакт."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Неможе да се ажурира адресар со празно име."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Грешка при ажурирање на адресарот."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Грешка во снимање на контактите на диск."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Големината на датотеката ја надминува upload_max_filesize директивата во php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Не можеше да се сними привремената фотографија:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Не можеше да се вчита привремената фотографија:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Жалам, оваа функционалност уште не е имплементирана"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Не е имплементирано"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Не можев да добијам исправна адреса."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Својството не смее да биде празно."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Уреди го името"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Датотеката која се обидувате да ја префрлите ја надминува максималната големина дефинирана за пренос на овој сервер."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Довлечкај VCF датотека да се внесат контакти."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Одбери тип"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Резултат: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "увезено,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "неуспешно."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Адресарот не е најден."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ова не е во Вашиот адресар."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Е-пошта"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Порака"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Роденден"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Роденден на {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Контакт"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додади контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Внеси"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Адресари"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Затвои"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Конфигурирај адресар"
@@ -441,11 +501,7 @@ msgstr "Конфигурирај адресар"
 msgid "New Address Book"
 msgstr "Нов адресар"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Внеси од VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Врска за CardDav"
@@ -459,186 +515,195 @@ msgid "Edit"
 msgstr "Уреди"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Преземи го контактот"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Довлечкај фотографија за да се подигне"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Избриши го контактот"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Избриши моментална фотографија"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Довлечкај фотографија за да се подигне"
+msgid "Edit current photo"
+msgstr "Уреди моментална фотографија"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Подигни нова фотографија"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Изберете фотографија од ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Уреди детали за име"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Прекар"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Внеси прекар"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Роденден"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Одвоете ги групите со запирка"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Уреди групи"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Претпочитано"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Ве молам внесете правилна адреса за е-пошта."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Внесете е-пошта"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Прати порака до адреса"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Избриши адреса за е-пошта"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Внесете телефонски број"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Избриши телефонски број"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Погледајте на мапа"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Уреди детали за адреса"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Внесете забелешки тука."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Додади поле"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Фотографија за профил"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Забелешка"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Избриши моментална фотографија"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Уреди моментална фотографија"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Подигни нова фотографија"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Преземи го контактот"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Изберете фотографија од ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Избриши го контактот"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Привремената слика е отстранета од кешот."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Уреди адреса"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Тип"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Поштенски фах"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Дополнително"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Улица"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Град"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Регион"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Поштенски код"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Држава"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Уреди категории"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Додади"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Адресар"
@@ -744,7 +809,6 @@ msgid "Submit"
 msgstr "Прати"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -764,33 +828,10 @@ msgstr "креирај нов адресар"
 msgid "Name of new addressbook"
 msgstr "Име на новиот адресар"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Внеси"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Внесување контакти"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Изберете адресар да се внесе:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Изберете од хард диск"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Немате контакти во Вашиот адресар."
@@ -803,18 +844,34 @@ msgstr "Додади контакт"
 msgid "Configure addressbooks"
 msgstr "Уреди адресари"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Адреса за синхронизација со CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "повеќе информации"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Примарна адреса"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index c6179ebf6fb999015823b1621b76bafae94ee087..679185b78f82cfe122f15fc3ee50e949a48a4706 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
 # Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/owncloud/language/mk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +34,89 @@ msgstr "Оваа категорија веќе постои:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Поставки"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Јануари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Февруари"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Март"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Април"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Мај"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Јуни"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Јули"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Август"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Септември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Октомври"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Ноември"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Декември"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Во ред"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Не е одбрана категорија за бришење."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ресетирање на Owncloud лозинка"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ресетирање на лозинка за ownCloud"
 
@@ -241,14 +246,10 @@ msgstr "Заврши го подесувањето"
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Поставки"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 010215ad8bc6a91e45adc2e1eb0fddcc43982393..41b9f3912043792eb88e000de94a9681b1fa808c 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 8c1d5f72cad21a6ddb055c99350a8786cbd00460..1bab894cc66f9b01b473a548fb9a2f255817b007 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -6,104 +6,101 @@
 # Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2012.
 # Hafiz Ismail <mhbinet@gmail.com>, 2012.
+# Zulhilmi Rosnin <zulhilmi.rosnin@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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\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"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Ralat nyahaktif buku alamat."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Terdapat masalah menambah maklumat."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nama elemen tidak ditetapkan."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID tidak ditetapkan."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Tidak boleh menambah ruang kosong."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Sekurangnya satu ruangan alamat perlu diisikan."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "Cuba untuk letak nilai duplikasi:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Terdapat masalah menambah maklumat."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
-msgstr ""
+msgstr "tiada ID diberi"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
-msgstr ""
+msgstr "Ralat menetapkan checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Tiada kategori dipilih untuk dibuang."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
-msgstr ""
+msgstr "Tiada buku alamat dijumpai."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
-msgstr ""
+msgstr "Tiada kenalan dijumpai."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
-msgstr ""
+msgstr "ID Hilang"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
-msgstr ""
-
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
+msgstr "Ralat VCard untuk ID: \""
 
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Masalah menambah buku alamat."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Masalah mengaktifkan buku alamat."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Tiada ID kenalan yang diberi."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
-msgstr ""
+msgstr "Ralat pada foto kenalan."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
-msgstr ""
+msgstr "Ralat menyimpan fail sementara"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
-msgstr ""
-
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
+msgstr "Foto muatan tidak sah."
 
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -113,341 +110,400 @@ msgstr "Maklumat vCard tidak tepat. Sila reload semula halaman ini."
 msgid "Error deleting contact property."
 msgstr "Masalah memadam maklumat."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
-
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
+msgstr "ID Kenalan telah hilang."
 
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Tiada direktori gambar yang diberi."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
-msgstr ""
+msgstr "Fail tidak wujud:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
-msgstr ""
+msgstr "Ralat pada muatan imej."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Ralat mendapatkan objek pada kenalan."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Ralat mendapatkan maklumat gambar."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Ralat menyimpan kenalan."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Ralat mengubah saiz imej"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Ralat memotong imej"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Ralat mencipta imej sementara"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Ralat mencari imej: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
-msgstr ""
+msgstr "checksum tidak ditetapkan."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "Maklumat tentang vCard tidak betul."
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Sesuatu tidak betul."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Masalah mengemaskini buku alamat."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Ralat memuatnaik senarai kenalan."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Saiz fail yang dimuatnaik melebihi upload_max_filesize yang ditetapkan dalam php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Fail yang dimuatnaik tidak lengkap"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Tiada fail dimuatnaik"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Direktori sementara hilang"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Tidak boleh menyimpan imej sementara: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Tidak boleh membuka imej sementara: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Maaf, fungsi ini masih belum boleh diguna lagi"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Tidak digunakan"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Tidak boleh mendapat alamat yang sah."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Ralat"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Hubungan"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Nilai ini tidak boleh kosong."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Ubah nama"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "PIlih jenis"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Hasil: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " import, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " gagal."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
-msgstr ""
+msgstr "Buku alamat tidak dijumpai."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ini bukan buku alamat anda."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Alamat"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Emel"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasi"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mudah alih"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Teks"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Suara"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
-msgstr ""
+msgstr "Mesej"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Alat Kelui"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
+msgstr "Internet"
+
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Hari lahir"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:182
+msgid "Call"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Hubungan"
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "Hari Lahir {name}"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Tambah kenalan"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Senarai Buku Alamat"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Tutup"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
-msgstr ""
+msgstr "Konfigurasi Buku Alamat"
 
 #: templates/part.chooseaddressbook.php:16
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Sambungan CardDav"
@@ -461,185 +517,194 @@ msgid "Edit"
 msgstr "Sunting"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Muat turun hubungan"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Letak foto disini untuk muatnaik"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Padam hubungan"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Padam foto semasa"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "Ubah foto semasa"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Muatnaik foto baru"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Pilih foto dari ownCloud"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "Ubah butiran nama"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
-msgstr ""
+msgstr "Nama Samaran"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
+msgstr "Masukkan nama samaran"
+
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Hari lahir"
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
-msgid "dd-mm-yyyy"
+#: templates/part.contact.php:43
+msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:45
+msgid "dd-mm-yyyy"
+msgstr "dd-mm-yyyy"
+
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
-msgstr ""
+msgstr "Kumpulan"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Asingkan kumpulan dengan koma"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
-msgstr ""
+msgstr "Ubah kumpulan"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Pilihan"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
-msgstr ""
+msgstr "Berikan alamat emel yang sah."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
-msgstr ""
+msgstr "Masukkan alamat emel"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
-msgstr ""
+msgstr "Hantar ke alamat"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
-msgstr ""
+msgstr "Padam alamat emel"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
-msgstr ""
+msgstr "Masukkan nombor telefon"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
-msgstr ""
+msgstr "Padam nombor telefon"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
-msgstr ""
+msgstr "Lihat pada peta"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
-msgstr ""
+msgstr "Ubah butiran alamat"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
-msgstr ""
+msgstr "Letak nota disini."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
-msgstr ""
+msgstr "Letak ruangan"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
-msgstr ""
-
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
+msgstr "Nota"
 
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Muat turun hubungan"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Padam hubungan"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Imej sementara telah dibuang dari cache."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
-msgstr ""
+msgstr "Ubah alamat"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Jenis"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Peti surat"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Sambungan"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Jalan"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "bandar"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Wilayah"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poskod"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Negara"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Tambah"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Negara"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -647,79 +712,79 @@ msgstr "Buku alamat"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Awalan nama"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Cik"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Cik"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Encik"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Tuan"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Puan"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Nama diberi"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "Nama tambahan"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
-msgstr ""
+msgstr "Nama keluarga"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Awalan nama"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "J.D."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -746,77 +811,69 @@ msgid "Submit"
 msgstr "Hantar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Batal"
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr ""
+msgstr "Import fail kenalan"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
-msgstr ""
+msgstr "Sila pilih buku alamat"
 
 #: templates/part.import.php:10
 msgid "create a new addressbook"
-msgstr ""
+msgstr "Cipta buku alamat baru"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
+msgstr "Nama buku alamat"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr ""
-
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
+msgstr "Import senarai kenalan"
 
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Anda tidak mempunyai sebarang kenalan didalam buku alamat."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
-msgstr ""
+msgstr "Letak kenalan"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "Konfigurasi buku alamat"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "more info"
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "alamat selarian CardDAV"
+
+#: templates/settings.php:3
+msgid "more info"
+msgstr "maklumat lanjut"
+
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Alamat utama"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 1e876b63d1ddeea1a08e1ce79bae7a8775566f07..ee0e7eeea28b7117a72700168ddc9516e33ac178 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
 #   <hadri.hilmi@gmail.com>, 2011, 2012.
 # Hadri Hilmi <hadri.hilmi@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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.net/projects/p/owncloud/language/ms_MY/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,99 +22,103 @@ msgstr ""
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr ""
+msgstr "nama applikasi tidak disediakan"
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
-msgstr ""
+msgstr "Tiada kategori untuk di tambah?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr ""
+msgstr "Kategori ini telah wujud"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Tetapan"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mac"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Jun"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julai"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Ogos"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Disember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Tidak"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "tiada kategori dipilih untuk penghapusan"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Ralat"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Penetapan kata laluan Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Set semula kata lalaun ownCloud"
 
 #: lostpassword/templates/email.php:1
 msgid "Use the following link to reset your password: {link}"
@@ -178,7 +183,7 @@ msgstr "Bantuan"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Larangan akses"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -186,7 +191,7 @@ msgstr "Awan tidak dijumpai"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Edit kategori"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
@@ -241,14 +246,10 @@ msgstr "Setup selesai"
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Tetapan"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 6220c70851d1f371d72871c7332b33ab614acc04..d008381d5db15747918d3d1c31f6aa2aeace76b9 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Padam"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 3c4fd0d42970b73cc7eb3043f453e318ff3a6941..291e1afa10a2ccff8c093cf5a96bcc1c9f85fa18 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,101 +11,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Et problem oppsto med å (de)aktivere adresseboken."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Et problem oppsto med å legge til kontakten."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id er ikke satt."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan ikke legge til tomt felt."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minst en av adressefeltene må oppgis."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Et problem oppsto med å legge til kontaktfeltet."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Ingen ID angitt"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Ingen kategorier valgt for sletting."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ingen adressebok funnet."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ingen kontakter funnet."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Manglende ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan ikke legge til en adressebok uten navn."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Et problem oppsto med å legge til adresseboken."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Et problem oppsto med å aktivere adresseboken."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Klarte ikke å lese kontaktbilde."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Klarte ikke å lagre midlertidig fil."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Bildet som lastes inn er ikke gyldig."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id er ikke satt."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
@@ -114,328 +110,391 @@ msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
 msgid "Error deleting contact property."
 msgstr "Et problem oppsto med å fjerne kontaktfeltet."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr ""
+msgstr "Kontakt-ID mangler."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Mangler kontakt-id."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Ingen filsti ble lagt inn."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Filen eksisterer ikke:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Klarte ikke å laste bilde."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Klarte ikke å lagre kontakt."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Klarte ikke å endre størrelse på bildet"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Klarte ikke å beskjære bildet"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Klarte ikke å lage et midlertidig bilde"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
+msgstr "Kunne ikke finne bilde:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Noe gikk fryktelig galt."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan ikke oppdatere adressebøker uten navn."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Et problem oppsto med å oppdatere adresseboken."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Kunne ikke lagre midlertidig bilde:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Kunne ikke laste midlertidig bilde:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Endre navn"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Velg type"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultat:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "importert,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "feilet."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresseboken ble ikke funnet."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internett"
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
-msgstr "bursdagen til {name}"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Bursdag"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr "{name}s bursdag"
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ny kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importer"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Lukk"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfigurer adressebok"
@@ -444,11 +503,7 @@ msgstr "Konfigurer adressebok"
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importer fra VDF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDAV-lenke"
@@ -462,193 +517,202 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Hend ned kontakten"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Dra bilder hit for å laste opp"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Slett kontakt"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Fjern nåværende bilde"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Dra bilder hit for å laste opp"
+msgid "Edit current photo"
+msgstr "Rediger nåværende bilde"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Last opp nytt bilde"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Velg bilde fra ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Endre detaljer rundt navn"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Skriv inn kallenavn"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Bursdag"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Skill gruppene med komma"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Endre grupper"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Vennligst angi en gyldig e-postadresse."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Skriv inn e-postadresse"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Send e-post til adresse"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Fjern e-postadresse"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Skriv inn telefonnummer"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Fjern telefonnummer"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Se på kart"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Endre detaljer rundt adresse"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Legg inn notater her."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Legg til felt"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profilbilde"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Notat"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Fjern nåværende bilde"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Rediger nåværende bilde"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Last opp nytt bilde"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Hend ned kontakten"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Velg bilde fra ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Slett kontakt"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Det midlertidige bildet er fjernet fra cache."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Endre adresse"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Utvidet"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gate"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "By"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Området"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Endre kategorier"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Ny"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adressebok"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Ærestitler"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
@@ -747,7 +811,6 @@ msgid "Submit"
 msgstr "Lagre"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -767,33 +830,10 @@ msgstr "Lag ny adressebok"
 msgid "Name of new addressbook"
 msgstr "Navn på ny adressebok"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importerer kontakter"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontakter i din adressebok"
@@ -806,18 +846,34 @@ msgstr "Ny kontakt"
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøker"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Synkroniseringsadresse for CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mer info"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 235bd24a6b2b753a2abb5aeb7da7f412faa56bda..b22e6e9fc1e64453c9f03fc2034627464eeecf91 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,10 +11,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,83 +37,87 @@ msgstr "Denne kategorien finnes allerede:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
-msgid "January"
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
+msgid "January"
+msgstr "Januar"
+
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nei"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ingen kategorier merket for sletting."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "OwnCloud passordtilbakestilling"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
 
@@ -243,14 +247,10 @@ msgstr "Fullfør oppsetting"
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Innstillinger"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 94f07c07b4c8482d6f4739fbfd0d6dab6dbb7999..60ac64821f4a085d233e3939c57dc324c401fac5 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Slett"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "opprettet ZIP-fil, dette kan ta litt tid"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index af8b706fd4958bae8fd947d251b70a899b69ba46..a67a57368905baa0b47de12995d3ae7793f6bc8b 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -12,101 +12,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Fout bij het (de)activeren van het adresboek."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Er was een fout bij het toevoegen van het contact."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "onderdeel naam is niet opgegeven."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id is niet ingesteld."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan geen lege eigenschap toevoegen."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minstens één van de adresvelden moet ingevuld worden."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Eigenschap bestaat al: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Fout bij het toevoegen van de contacteigenschap."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Geen ID opgegeven"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Instellen controlegetal mislukt"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Geen categorieën geselecteerd om te verwijderen."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Geen adresboek gevonden"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Geen contracten gevonden"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Ontbrekend ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Fout bij inlezen VCard voor ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Kan geen adresboek toevoegen zonder naam."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Fout bij het toevoegen van het adresboek."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Fout bij het activeren van het adresboek."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Geen contact ID opgestuurd."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Lezen van contact foto mislukt."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Tijdelijk bestand opslaan mislukt."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "De geladen foto is niet goed."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id is niet ingesteld."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
@@ -115,231 +111,185 @@ msgstr "Informatie over de vCard is onjuist. Herlaad de pagina."
 msgid "Error deleting contact property."
 msgstr "Fout bij het verwijderen van de contacteigenschap."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Contact ID ontbreekt."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Ontbrekende contact id."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Geen fotopad opgestuurd."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Bestand bestaat niet:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Fout bij laden plaatje."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "onderdeel naam is niet opgegeven."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "controlegetal is niet opgegeven."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informatie over vCard is fout. Herlaad de pagina: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Er ging iets totaal verkeerd. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Kan adresboek zonder naam niet wijzigen"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Fout bij het updaten van het adresboek."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Het bestand overschrijdt de upload_max_filesize instelling in php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacten"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Sleep een VCF bestand om de contacten te importeren."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -352,91 +302,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresboek niet gevonden."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Verjaardag"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}'s verjaardag"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contact"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Contact toevoegen"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importeer"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresboeken"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Instellen adresboeken"
@@ -445,11 +504,7 @@ msgstr "Instellen adresboeken"
 msgid "New Address Book"
 msgstr "Nieuw Adresboek"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importeer uit VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Link"
@@ -463,186 +518,195 @@ msgid "Edit"
 msgstr "Bewerken"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Verwijder foto uit upload"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Verwijder contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Verwijdere huidige foto"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Verwijder foto uit upload"
+msgid "Edit current photo"
+msgstr "Wijzig huidige foto"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Upload nieuwe foto"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Selecteer foto uit ownCloud"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formateer aangepast, Korte naam, Volledige naam, Achteruit of Achteruit met komma"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Wijzig naam gegevens"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Roepnaam"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Voer roepnaam in"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Verjaardag"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Gebruik komma bij meerder groepen"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Wijzig groepen"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Voorkeur"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Geef een geldig email adres op."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Voer email adres in"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Mail naar adres"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Verwijder email adres"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Voer telefoonnummer in"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Verwijdere telefoonnummer"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Bekijk op een kaart"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Wijzig adres gegevens"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Voeg notitie toe"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Voeg veld toe"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profiel foto"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefoon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Notitie"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Verwijdere huidige foto"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Wijzig huidige foto"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Upload nieuwe foto"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Download contact"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Selecteer foto uit ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Verwijder contact"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Wijzig adres"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Type"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postbus"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Uitgebreide"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Straat"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regio"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postcode"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Land"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Wijzig categorieën"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Voeg toe"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adresboek"
@@ -748,7 +812,6 @@ msgid "Submit"
 msgstr "Opslaan"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuleren"
 
@@ -768,33 +831,10 @@ msgstr "Maak een nieuw adresboek"
 msgid "Name of new addressbook"
 msgstr "Naam van nieuw adresboek"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importeer"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importeren van contacten"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selecteer adresboek voor import:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Selecteer van schijf"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Je hebt geen contacten in je adresboek"
@@ -807,18 +847,34 @@ msgstr "Contactpersoon toevoegen"
 msgid "Configure addressbooks"
 msgstr "Bewerken adresboeken"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synchroniseert de adressen"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "meer informatie"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Standaardadres"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "IOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 1bdd585b7e4c6faa4779a976229ac0b31ac3c1bd..587342c1fcabfac71d2de69a69a1224008268482 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -6,16 +6,17 @@
 #   <bart.formosus@gmail.com>, 2011.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011.
+#   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/language/nl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,83 +39,87 @@ msgstr "De categorie bestaat al."
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
-msgid "January"
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Instellingen"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
+msgid "January"
+msgstr "Januari"
+
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Geen categorie geselecteerd voor verwijdering."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Reset je ownCloud wachtwoord"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
 
@@ -244,14 +249,10 @@ msgstr "Installatie afronden"
 msgid "web services under your control"
 msgstr "webdiensten die je beheerst"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Instellingen"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Uw wachtwoord vergeten?"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f7f4ade3275574ba2c9c75afeb96062149a53d34..fd294e92b51be0461becf12003a73e06beefcc75 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -66,14 +66,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index 93385875c22ceb137319212b2400bcb21c00f2db..ceeea1a2bd0984c01783fd673d6c99817e7c1dc9 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,101 +9,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\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"
+"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Det kom ei feilmelding då kontakta vart lagt til."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Kan ikkje leggja til tomt felt."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Minst eit av adressefelta må fyllast ut."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Eit problem oppstod ved å leggja til kontakteltet."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Eit problem oppstod ved å leggja til adresseboka."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Eit problem oppstod ved aktivering av adresseboka."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
@@ -112,231 +108,185 @@ msgstr "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt."
 msgid "Error deleting contact property."
 msgstr "Eit problem oppstod ved å slette kontaktfeltet."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Eit problem oppstod ved å oppdatere adresseboka."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,91 +299,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Bursdag"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Legg til kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -442,11 +501,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav lenkje"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "Endra"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Last ned kontakt"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Slett kontakt"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Bursdag"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Føretrekt"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefonnummer"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Last ned kontakt"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Slett kontakt"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Skriv"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Postboks"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Utvida"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Gate"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Stad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region/fylke"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Land"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Legg til"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Land"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "Send"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Kanseller"
 
@@ -765,33 +828,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index f8af21ff3e17cb29a7750b173bd72ef8c10b443b..6374219085a5d1f7ae7757489f23bcfd12265f3e 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.net/projects/p/owncloud/language/nn_NO/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,51 +35,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Innstillingar"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -108,10 +116,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud Passord tilbakestilling"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -241,14 +245,10 @@ msgstr "Fullfør oppsettet"
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Innstillingar"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 1bd790c78830e959c3fd0807d33ebfd8f702e30b..5d14be6b12872b6c0ad4de4646d7bbdf210ad009 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Slett"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index 2219380006f0b6b552113857057db850dbe1b238..c6c1bf1a2d0bda58fafb9321cd778e9181638c2a 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,101 +11,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\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"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Błąd (de)aktywowania książki adresowej."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Wystąpił błąd podczas dodawania kontaktu."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nazwa elementu nie jest ustawiona."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id nie ustawione."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nie można dodać pustego elementu."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Należy wypełnić przynajmniej jedno pole adresu."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Próba dodania z duplikowanej właściwości:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Błąd dodawania elementu."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Brak opatrzonego ID "
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Błąd ustawień sumy kontrolnej"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nie zaznaczono kategorii do usunięcia"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nie znaleziono książek adresowych"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nie znaleziono kontaktów."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Brak ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Wystąpił błąd podczas przetwarzania VCard ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nie można dodać książki adresowej z pusta nazwą"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Błąd dodawania książki adresowej."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Błąd aktywowania książki adresowej."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "ID kontaktu nie został utworzony."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Błąd odczytu zdjęcia kontaktu."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Wystąpił błąd podczas zapisywania pliku tymczasowego."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Wczytywane zdjęcie nie jest poprawne."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id nie ustawione."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
@@ -114,328 +110,391 @@ msgstr "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę."
 msgid "Error deleting contact property."
 msgstr "Błąd usuwania elementu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Brak kontaktu id."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Brak kontaktu id."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Ścieżka do zdjęcia nie została podana."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Plik nie istnieje:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Błąd ładowania obrazu."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Błąd pobrania kontaktu."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Błąd uzyskiwania właściwości ZDJĘCIA."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Błąd zapisu kontaktu."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Błąd zmiany rozmiaru obrazu"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Błąd przycinania obrazu"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Błąd utworzenia obrazu tymczasowego"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "nazwa elementu nie jest ustawiona."
+msgstr "Błąd znajdowanie obrazu: "
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum-a nie ustawiona"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacje na temat vCard są niepoprawne. Proszę przeładuj stronę:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Gdyby coś poszło FUBAR."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Błąd uaktualniania książki adresowej."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Wystąpił błąd podczas wysyłania kontaktów do magazynu."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nie było błędów, plik wyczytano poprawnie."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Załadowany plik przekracza wielkość upload_max_filesize w php.ini "
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Wczytywany plik przekracza wielkość MAX_FILE_SIZE, która została określona w formularzu HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Załadowany plik tylko częściowo został wysłany."
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Plik nie został załadowany"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Brak folderu tymczasowego"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Nie można zapisać obrazu tymczasowego: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Nie można wczytać obrazu tymczasowego: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Plik nie został załadowany. Nieznany błąd"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Niestety, ta funkcja nie została jeszcze zaimplementowana"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Nie wdrożono"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Nie można pobrać prawidłowego adresu."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kontakt"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Ta właściwość nie może być pusta."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Zmień nazwę"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Upuść plik VCF do importu kontaktów."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Wybierz typ"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Wynik: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " importowane, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "  nie powiodło się."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Nie znaleziono książki adresowej"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "To nie jest Twoja książka adresowa."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Połączenie tekstowe"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Wiadomość"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Urodziny"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name} Urodzony"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Import"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Książki adresowe"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zamknij"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Konfiguruj książkę adresową"
@@ -444,11 +503,7 @@ msgstr "Konfiguruj książkę adresową"
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importuj z VFC"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Wyświetla odnośnik CardDav"
@@ -462,186 +517,195 @@ msgid "Edit"
 msgstr "Edytuje książkę adresową"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Usuwa książkę adresową"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Pobiera kontakt"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Upuść fotografię aby załadować"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Usuwa kontakt"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Usuń aktualne zdjęcie"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Upuść fotografię aby załadować"
+msgid "Edit current photo"
+msgstr "Edytuj aktualne zdjęcie"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Wczytaj nowe zdjęcie"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Wybierz zdjęcie z ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format niestandardowy, krótkie nazwy, imię i nazwisko, Odwracać lub Odwrócić z przecinkiem"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Edytuj szczegóły nazwy"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Nazwa"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Wpisz nazwę"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Urodziny"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-rrrr"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Oddziel grupy przecinkami"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Edytuj grupy"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferowane"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Określ prawidłowy adres e-mail."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Wpisz adres email"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Mail na adres"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Usuń adres mailowy"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Wpisz numer telefonu"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Usuń numer telefonu"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Edytuj szczegóły adresu"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Dodaj notatkę tutaj."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Dodaj pole"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Zdjęcie profilu"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Uwaga"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Usuń aktualne zdjęcie"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Edytuj aktualne zdjęcie"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Wczytaj nowe zdjęcie"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Pobiera kontakt"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Wybierz zdjęcie z ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Usuwa kontakt"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Tymczasowy obraz został usunięty z pamięci podręcznej."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Edytuj adres"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Typ"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Skrzynka pocztowa"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Rozszerzony"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Miasto"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Region"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Kod pocztowy"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Kraj"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Edytuj kategorie"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Książka adresowa"
@@ -747,7 +811,6 @@ msgid "Submit"
 msgstr "Potwierdź"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -767,33 +830,10 @@ msgstr "utwórz nową książkę adresową"
 msgid "Name of new addressbook"
 msgstr "Nazwa nowej książki adresowej"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Import"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "importuj kontakty"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Zaznacz książkę adresową do importu do:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Wybierz z HD"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
@@ -806,18 +846,34 @@ msgstr "Dodaj kontakt"
 msgid "Configure addressbooks"
 msgstr "Konfiguruj książkę adresową"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "adres do synchronizacji CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "więcej informacji"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Pierwszy adres"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 905b545290d659d5e09280ef8ff49559a096a36b..5049bce7f64266ed7f996d7474a894e59c01a77e 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <>, 2012.
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
@@ -12,10 +13,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,85 +37,89 @@ msgstr "Ta kategoria już istnieje"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Tak"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nie ma kategorii zaznaczonych do usunięcia."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Resetowanie hasła"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "restart hasła"
 
@@ -244,14 +249,10 @@ msgstr "Zakończ konfigurowanie"
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ustawienia"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 89fc6e75afe32ebcec4fc9ce41d060a0c6bba787..8f4aad1f4e8cb72c76207010bc7f2b7482361a13 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Usuwa element"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "wróć"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "skasuj"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
diff --git a/l10n/pl/gallery.po b/l10n/pl/gallery.po
index b53b2545d66565f07635b7d27b132cb29e15e79e..ff5aef8d74e233158b0e90174dbfe03bc3c09757 100644
--- a/l10n/pl/gallery.po
+++ b/l10n/pl/gallery.po
@@ -4,77 +4,42 @@
 # 
 # Translators:
 # Bartek  <bart.p.pl@gmail.com>, 2012.
+# Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 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: Polish (http://www.transifex.net/projects/p/owncloud/language/pl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 10:41+0000\n"
+"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Zdjęcia"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Udostępnij galerię"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Błąd: "
 
-#: 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 "Ustawienia"
-
-#: 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 "Przeszukaj"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stop"
+msgstr "Błąd wewnętrzny"
 
-#: templates/index.php:18
-msgid "Share"
-msgstr "Współdziel"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Pokaz slajdów"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index f2be42ae6817a3023da883d682d1e8d31649bdd5..9f9833ac2d7b02b524b71abce0889949c2c17d2f 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.po
@@ -5,106 +5,102 @@
 # Translators:
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
-# Van Der Fran <transifex@vanderland.com>, 2011.
+# Van Der Fran <transifex@vanderland.com>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Erro ao (des)ativar agenda."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Ocorreu um erro ao adicionar o contato."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "nome do elemento não definido."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID não definido."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Não é possível adicionar propriedade vazia."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Pelo menos um dos campos de endereço tem que ser preenchido."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Tentando adiciona propriedade duplicada:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Erro ao adicionar propriedade de contato."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID fornecido"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Erro ajustando checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nenhum categoria selecionada para remoção."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nenhuma agenda de endereços encontrada."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nenhum contato encontrado."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Faltando ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro de identificação VCard para ID:"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Não é possivel adicionar uma agenda de endereços com o nome em branco."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Erro ao adicionar agenda."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Erro ao ativar agenda."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nenhum ID do contato foi submetido."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erro de leitura na foto do contato."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erro ao salvar arquivo temporário."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Foto carregada não é válida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID não definido."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página."
@@ -113,328 +109,391 @@ msgstr "Informações sobre vCard é incorreta. Por favor, recarregue a página.
 msgid "Error deleting contact property."
 msgstr "Erro ao excluir propriedade de contato."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID do contato está faltando."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Faltando ID do contato."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nenhum caminho para foto foi submetido."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Arquivo não existe:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Erro ao carregar imagem."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erro ao obter propriedade de contato."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erro ao obter propriedade da FOTO."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erro ao salvar contato."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erro ao modificar tamanho da imagem"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erro ao recortar imagem"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erro ao criar imagem temporária"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "nome do elemento não definido."
+msgstr "Erro ao localizar imagem:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum não definido."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informação sobre vCard incorreto. Por favor, recarregue a página:"
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Something went FUBAR. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Não é possível atualizar sua agenda com um nome em branco."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Erro ao atualizar agenda."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Arquivo enviado com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi parcialmente carregado"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo carregado"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Diretório temporário não encontrado"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Não foi possível salvar a imagem temporária:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Não foi possível carregar a imagem temporária:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contatos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Desculpe, esta funcionalidade não foi implementada ainda"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "não implementado"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Não foi possível obter um endereço válido."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Erro"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contato"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Editar nome"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Arraste um arquivo VCF para importar contatos."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Selecione o tipo"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultado:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "importado,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "falhou."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Lista de endereços não encontrado."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua agenda de endereços."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Aniversário de {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contato"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contato"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Agendas de Endereço"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Fechar."
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configurar Livro de Endereços"
@@ -443,11 +502,7 @@ msgstr "Configurar Livro de Endereços"
 msgid "New Address Book"
 msgstr "Nova agenda"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importar de VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Link CardDav"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Baixar contato"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Arraste a foto para ser carregada"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Apagar contato"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Deletar imagem atual"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Arraste a foto para ser carregada"
+msgid "Edit current photo"
+msgstr "Editar imagem atual"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Carregar nova foto"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Selecionar foto do OwnCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome curto, Nome completo, Inverter ou Inverter com vírgula"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Apelido"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Digite o apelido"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversário"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separe grupos por virgula"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor, especifique um email válido."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Digite um endereço de email"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Correio para endereço"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Remover endereço de email"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Digite um número de telefone"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Remover número de telefone"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Visualizar no mapa"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar detalhes de endereço"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Adicionar notas"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Imagem do Perfil"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Deletar imagem atual"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Editar imagem atual"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Carregar nova foto"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Baixar contato"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Selecionar foto do OwnCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Apagar contato"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "A imagem temporária foi removida cache."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editar endereço"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Digite"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Caixa Postal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Estendido"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rua"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Região"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "CEP"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adicionar"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Agenda de Endereço"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -766,33 +829,10 @@ msgstr "Criar nova agenda de endereços"
 msgid "Name of new addressbook"
 msgstr "Nome da nova agenda de endereços"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Importar contatos"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Selecione agenda de endereços para importar ao destino:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Selecione do disco rigído"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Voce não tem contatos em sua agenda de endereços."
@@ -805,18 +845,34 @@ msgstr "Adicionar contatos"
 msgid "Configure addressbooks"
 msgstr "Configurar agenda de endereços"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Sincronizando endereços CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "leia mais"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Endereço primário(Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 0c9e514fdb34e3f1ae51e9cb3d3a1e42de707a07..2e90ce266ff698467726fcd8582003e6aa561b83 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -6,15 +6,16 @@
 #   <duda.nogueira@metasys.com.br>, 2011.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
+# Unforgiving Fallout <>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/owncloud/language/pt_BR/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,85 +36,89 @@ msgstr "Essa categoria já existe"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Configurações"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Março"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nenhuma categoria selecionada para deletar."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Mudar senha do Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
@@ -243,14 +248,10 @@ msgstr "Concluir configuração"
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Configurações"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Esqueçeu sua senha?"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index bb08e22da87520a5d034097fa1d8cbc4be5b2636..66f9894b6a40d15d77271a577ad6e50a719aaf95 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +63,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "gerando arquivo ZIP, isso pode levar um tempo."
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index 4b0f48cbee5b633e35d3032b45134d71b16ace74..c76d7bf6d2d0158c3cf780805d1e2bcd43e25461 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.po
@@ -10,101 +10,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Erro a (des)ativar o livro de endereços"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Erro ao adicionar contato"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "o nome do elemento não está definido."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id não está definido"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Não é possivel adicionar uma propriedade vazia"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Pelo menos um dos campos de endereço precisa de estar preenchido"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "A tentar adicionar propriedade duplicada: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Erro ao adicionar propriedade do contato"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID inserido"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Erro a definir checksum."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nenhuma categoria selecionada para eliminar."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nenhum livro de endereços encontrado."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nenhum contacto encontrado."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Falta ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Erro a analisar VCard para o ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Não é possivel adicionar Livro de endereços com nome vazio."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Erro ao adicionar livro de endereços"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Erro ao ativar livro de endereços"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nenhum ID de contacto definido."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erro a ler a foto do contacto."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erro a guardar ficheiro temporário."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "A foto carregada não é valida."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id não está definido"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "A informação sobre o vCard está incorreta. Por favor refresque a página"
@@ -113,328 +109,391 @@ msgstr "A informação sobre o vCard está incorreta. Por favor refresque a pág
 msgid "Error deleting contact property."
 msgstr "Erro ao apagar propriedade do contato"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Falta o ID do contacto."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Falta o ID do contacto."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nenhum caminho da foto definido."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "O ficheiro não existe:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Erro a carregar a imagem."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Erro a obter o objecto dos contactos"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Erro a obter a propriedade Foto"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Erro a guardar o contacto."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Erro a redimensionar a imagem"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Erro a recorar a imagem"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Erro a criar a imagem temporária"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Erro enquanto pesquisava pela imagem: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "o nome do elemento não está definido."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "Checksum não está definido."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "A informação sobre o VCard está incorrecta. Por favor refresque a página: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Algo provocou um FUBAR. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Erro a atualizar o livro de endereços"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro a carregar os contactos para o armazenamento."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Não ocorreu erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "O tamanho do ficheiro carregado excede o parametro upload_max_filesize em php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Está a faltar a pasta temporária"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Não foi possível guardar a imagem temporária: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Não é possível carregar a imagem temporária: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Desculpe, esta funcionalidade ainda não está implementada"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Não implementado"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Não foi possível obter um endereço válido."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contacto"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Editar nome"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Seleccionar tipo"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultado: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " importado, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " falhou."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Livro de endereços não encontrado."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Aniversário"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Aniversário de {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contacto"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adicionar Contacto"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Importar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Livros de endereços"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Fechar"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Configurar livros de endereços"
@@ -443,11 +502,7 @@ msgstr "Configurar livros de endereços"
 msgid "New Address Book"
 msgstr "Novo livro de endereços"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Importar de VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Endereço CardDav"
@@ -461,197 +516,206 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Apagar"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Transferir contacto"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Arraste e solte fotos para carregar"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Apagar contato"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Eliminar a foto actual"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr ""
+msgid "Edit current photo"
+msgstr "Editar a foto actual"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Carregar nova foto"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Selecionar uma foto da ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introduza alcunha"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Aniversário"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separe os grupos usando virgulas"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Por favor indique um endereço de correio válido"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introduza endereço de email"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Enviar correio para o endereço"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Eliminar o endereço de correio"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Insira o número de telefone"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Eliminar o número de telefone"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Editar os detalhes do endereço"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Insira notas aqui."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Foto do perfil"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Eliminar a foto actual"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Editar a foto actual"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Transferir contacto"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Selecionar uma foto da ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Apagar contato"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "A imagem temporária foi retirada do cache."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Editar endereço"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Apartado"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extendido"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Rua"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Cidade"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Região"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Código Postal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "País"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adicionar"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Livro de endereços"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Prefixos honoráveis"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Menina"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
@@ -667,7 +731,7 @@ msgstr "Sr"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Senhora"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
@@ -675,7 +739,7 @@ msgstr "Dr"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
-msgstr ""
+msgstr "Nome introduzido"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
@@ -687,39 +751,39 @@ msgstr "Nome de familia"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Sufixos Honoráveis"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "D.J."
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "D.M."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Dr."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "r."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Submeter"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -764,38 +827,15 @@ msgstr "Criar um novo livro de endereços"
 
 #: templates/part.import.php:15
 msgid "Name of new addressbook"
-msgstr ""
-
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Importar"
+msgstr "Nome do novo livro de endereços"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "A importar os contactos"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "Não tem contactos no seu livro de endereços."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -803,20 +843,36 @@ msgstr "Adicionar contacto"
 
 #: templates/part.no_contacts.php:5
 msgid "Configure addressbooks"
+msgstr "Configurar livros de endereços"
+
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "CardDAV a sincronizar endereços"
+
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mais informação"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Endereço primario (Kontact et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index c1427407a887219d997a4b171b9e21fafe73ebd7..31d1426a4754f1e54c0df7ee35b9697ad71a3df3 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,10 +10,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/owncloud/language/pt_PT/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Esta categoria já existe:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Definições"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Março"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nenhuma categoria seleccionar para eliminar"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Redefinir palavra-chave ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
 
@@ -242,14 +246,10 @@ msgstr "Acabar instalação"
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Definições"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Esqueceu a sua password?"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index c1eaa89957d5ac9454b5a21891762cf491792fa5..346dbc31393114601ed9cdbd1bcba3b0c79b982d 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Apagar"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo."
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 1a257a79476e2e899b7f9e054648c0d2d1bdf0da..0cff9f1cd589df8e91ad2aca4a714f65ff6afdc2 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.po
@@ -10,101 +10,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\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"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "(Dez)activarea agendei a întâmpinat o eroare."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "O eroare a împiedicat adăugarea contactului."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "numele elementului nu este stabilit."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ID-ul nu este stabilit"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Nu se poate adăuga un câmp gol."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Cel puțin unul din câmpurile adresei trebuie completat."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Contactul nu a putut fi adăugat."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nici un ID nu a fost furnizat"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Eroare la stabilirea sumei de control"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nici o categorie selectată pentru ștergere"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Nici o carte de adrese găsită"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Nici un contact găsit"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "ID lipsă"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Eroare la prelucrarea VCard-ului pentru ID:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Nu e posibil de adăugat o carte de adrese fără nume"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Agenda nu a putut fi adăugată."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Eroare la activarea agendei."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nici un ID de contact nu a fost transmis"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Eroare la citerea fotografiei de contact"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Eroare la salvarea fișierului temporar."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Fotografia care se încarcă nu este validă."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ID-ul nu este stabilit"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pagina."
@@ -113,231 +109,185 @@ msgstr "Informațiile cărții de vizită sunt incorecte. Te rog reîncarcă pag
 msgid "Error deleting contact property."
 msgstr "Eroare la ștergerea proprietăților contactului."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID-ul de contact lipsește."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "ID de contact lipsă."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Nici o adresă către fotografie nu a fost transmisă"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Fișierul nu există:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Eroare la încărcarea imaginii."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "numele elementului nu este stabilit."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "suma de control nu este stabilită."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Eroare la actualizarea agendei."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacte"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Contact"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -350,91 +300,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Mesaj"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Zi de naștere"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "Ziua de naștere a {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Contact"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Adaugă contact"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Agende"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -443,11 +502,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Agendă nouă"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Legătură CardDev"
@@ -461,185 +516,194 @@ msgid "Edit"
 msgstr "Editează"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Descarcă acest contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Șterge contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Introdu detalii despre nume"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Introdu pseudonim"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Zi de naștere"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "zz-ll-aaaa"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Separă grupurile cu virgule"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Editează grupuri"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Preferat"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Te rog să specifici un e-mail corect"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Introdu adresa de e-mail"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Trimite mesaj la e-mail"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Șterge e-mail"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Descarcă acest contact"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Șterge contact"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tip"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "CP"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Extins"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Stradă"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Oraș"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regiune"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Cod poștal"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Țară"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Adaugă"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Țară"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Trimite"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -766,33 +829,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -805,18 +845,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 3aed0fedf496ffc10b60cbd7660a5c0a98f17d9b..c718775f6e2fa7821ce7295a6cba2441fa95120e 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -10,10 +10,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/owncloud/language/ro/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,51 +36,59 @@ msgstr "Această categorie deja există:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Configurări"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -109,10 +117,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Resetarea parolei ownCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
 
@@ -242,14 +246,10 @@ msgstr "Finalizează instalarea"
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Configurări"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index ef7d5e76b63513d30579775f1bfa5ad4f95b96d1..d936c43c2c6cb6345bec4b5aba221af506f27af7 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/ru/calendar.po b/l10n/ru/calendar.po
index 32c4700f8df267494124ea187c89815f2acafc11..1d841d6166ddfc39244ce59c50bbc3fa38c78c0a 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/calendar.po
@@ -7,25 +7,34 @@
 #   <jekader@gmail.com>, 2011, 2012.
 # Nick Remeslennikov <homolibere@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-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:20+0000\n"
+"Last-Translator: Nick Remeslennikov <homolibere@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Не все календари полностью кешированы"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Все, вроде бы, закешировано"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Календари не найдены."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "События не найдены."
 
@@ -33,300 +42,395 @@ msgstr "События не найдены."
 msgid "Wrong calendar"
 msgstr "Неверный календарь"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Файл либо не собержит событий, либо все события уже есть в календаре"
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "события были сохранены в новый календарь"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "Ошибка импорта"
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "события были сохранены в вашем календаре"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Новый часовой пояс:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Часовой пояс изменён"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Календарь"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ддд"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ддд М/д"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "дддд М/д"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "ММММ гггг"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
-msgstr ""
+msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "дддд, МММ д, гггг"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "Бизнес"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Звонить"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Клиенты"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Доставщик"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Праздники"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Идеи"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Поездка"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Юбилей"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Встреча"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Другое"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Личное"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Проекты"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Вопросы"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr ""
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "без имени"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Новый Календарь"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Не повторяется"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Еженедельно"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "По будням"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "Каждые две недели"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Каждый месяц"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Каждый год"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "никогда"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "по числу повторений"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "по дате"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "по дню месяца"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "по дню недели"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Понедельник"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Среда"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Четверг"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Пятница"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Суббота"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "неделя месяца"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "первая"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "вторая"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "третья"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "червётрая"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "пятая"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "последняя"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Январь"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Февраль"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Март"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Апрель"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Май"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Июнь"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Июль"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Август"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Сентябрь"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Октябрь"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Ноябрь"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Декабрь"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "по дате событий"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "по дням недели"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "по номерам недели"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "по дню и месяцу"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Дата"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Кал."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Вс."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Пн."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Вт."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Ср."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Чт."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Пт."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Сб."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Янв."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Фев."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Мар."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Апр."
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "Май."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Июн."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Июл."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Авг."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Сен."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Окт."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Ноя."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Дек."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Весь день"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Новый Календарь"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Незаполненные поля"
@@ -360,27 +464,27 @@ msgstr "Окончание события раньше, чем его начал
 msgid "There was a database fail"
 msgstr "Ошибка базы данных"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Неделя"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Список"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Сегодня"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Календари"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Не удалось обработать файл."
 
@@ -393,7 +497,7 @@ msgid "Your calendars"
 msgstr "Ваши календари"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "Ссылка для CalDav"
 
@@ -405,19 +509,19 @@ msgstr "Общие календари"
 msgid "No shared calendars"
 msgstr "Нет общих календарей"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Сделать календарь общим"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Редактировать"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Удалить"
@@ -503,23 +607,23 @@ msgstr "Разделяйте категории запятыми"
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Событие на весь день"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "От"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "До"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Дополнительные параметры"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Место"
 
@@ -527,7 +631,7 @@ msgstr "Место"
 msgid "Location of the Event"
 msgstr "Место события"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Описание"
 
@@ -535,84 +639,86 @@ msgstr "Описание"
 msgid "Description of the Event"
 msgstr "Описание события"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Повтор"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Выбрать дни недели"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Выбрать дни"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "и день года события"
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "и день месяца события"
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Выбрать месяцы"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Выбрать недели"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "и номер недели события"
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Интервал"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Окончание"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "повторений"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Создать новый календарь"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Импортировать календарь из файла"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
 msgstr "Пожалуйста, выберите календарь"
 
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Создать новый календарь"
-
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Название нового календаря"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Импортировать"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr ""
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Импортируется календарь"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr ""
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Календарь успешно импортирован"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "Импортировать"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Закрыть Сообщение"
 
@@ -628,17 +734,13 @@ msgstr "Показать событие"
 msgid "No categories selected"
 msgstr "Категории не выбраны"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Выбрать категорию"
-
 #: templates/part.showevent.php:37
 msgid "of"
-msgstr ""
+msgstr "из"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
-msgstr ""
+msgstr "на"
 
 #: templates/settings.php:14
 msgid "Timezone"
@@ -664,9 +766,33 @@ msgstr "12ч"
 msgid "First day of the week"
 msgstr "Первый день недели"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "Адрес синхронизации календаря CalDAV:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr ""
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "подробнее"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr ""
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index f44e9700f0d1b5de6ea5bb1e09a8de86ed5fa04a..a7988b19f42479feeaa93853f926612e26ef84bb 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.po
@@ -9,105 +9,102 @@
 #   <lankme@gmail.com>, 2012.
 # Nick Remeslennikov <homolibere@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-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\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"
+"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Ошибка (де)активации адресной книги."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Произошла ошибка при добавлении контакта."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "имя элемента не установлено."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id не установлен."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Невозможно добавить пустой параметр."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Как минимум одно поле адреса должно быть заполнено."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
-msgstr ""
+msgstr "При попытке добавить дубликат:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Ошибка добавления информации к контакту."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID не предоставлен"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Ошибка установки контрольной суммы."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Категории для удаления не установлены."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Адресные книги не найдены."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Контакты не найдены."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Отсутствует ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Ошибка обработки VCard для ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Нельзя добавить адресную книгу без имени."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Ошибка добавления адресной книги."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Ошибка активации адресной книги."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
-msgstr ""
+msgstr "Нет контакта ID"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Ошибка чтения фотографии контакта."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Ошибка сохранения временного файла."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Загружаемая фотография испорчена."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id не установлен."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Информация о vCard некорректна. Пожалуйста, обновите страницу."
@@ -116,328 +113,391 @@ msgstr "Информация о vCard некорректна. Пожалуйст
 msgid "Error deleting contact property."
 msgstr "Ошибка удаления информации из контакта."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "ID контакта отсутствует."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
-msgstr ""
+msgstr "Нет фото по адресу."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Файл не существует:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Ошибка загрузки картинки."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Ошибка при получении контактов"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Ошибка при получении ФОТО."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Ошибка при сохранении контактов."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Ошибка изменения размера изображений"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Ошибка обрезки изображений"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Ошибка создания временных изображений"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "имя элемента не установлено."
+msgstr "Ошибка поиска изображений:"
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "контрольная сумма не установлена."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Информация о vCard не корректна. Перезагрузите страницу: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "Что-то пошло FUBAR."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Ошибка обновления информации контакта."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Нельзя обновить адресную книгу с пустым именем."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Ошибка обновления адресной книги."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ошибка загрузки контактов в хранилище."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл загружен успешно."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Загружаемый файл первосходит значение переменной upload_max_filesize, установленно в php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл загружен частично"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временная папка"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Не удалось сохранить временное изображение:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Не удалось загрузить временное изображение:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Контакты"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "К сожалению, эта функция не была реализована"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Не реализовано"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Не удалось получить адрес."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Это свойство должно быть не пустым."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Изменить имя"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Выберите тип"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Результат:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "импортировано, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "не удалось."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Адресная книга не найдена."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Это не ваша адресная книга."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адрес"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Ящик эл. почты"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организация"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Сообщение"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "День рождения"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "День рождения {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Контакт"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Добавить Контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Импорт"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Адресные книги"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Закрыть"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Настроить Адресную книгу"
@@ -446,11 +506,7 @@ msgstr "Настроить Адресную книгу"
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Импортировать из VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "Ссылка CardDAV"
@@ -464,217 +520,226 @@ msgid "Edit"
 msgstr "Редактировать"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Скачать контакт"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Перетяните фотографии для загрузки"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Удалить контакт"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Удалить текущую фотографию"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Перетяните фотографии для загрузки"
+msgid "Edit current photo"
+msgstr "Редактировать текущую фотографию"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Загрузить новую фотографию"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Выбрать фотографию из ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "Формат Краткое имя, Полное имя"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
-msgstr ""
+msgstr "Изменить детали имени"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Введите псевдоним"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "День рождения"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
-msgstr ""
+msgstr "Разделить группы запятыми"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Редактировать группы"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Предпочитаемый"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Укажите действительный адрес электронной почты."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Укажите адрес электронной почты"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Написать по адресу"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Удалить адрес электронной почты"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Ввести номер телефона"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Удалить номер телефона"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Показать на карте"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Ввести детали адреса"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Добавьте заметки здесь."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Добавить поле"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Фото профиля"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Заметка"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Удалить текущую фотографию"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Редактировать текущую фотографию"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Загрузить новую фотографию"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Скачать контакт"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Выбрать фотографию из ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Удалить контакт"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Временный образ был удален из кэша."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Редактировать адрес"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Тип"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "АО"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Расширенный"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Улица"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Город"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Область"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Почтовый индекс"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Страна"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Редактировать категрии"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Добавить"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Адресная книга"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "Уважительные префиксы"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Мисс"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Г-жа"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "Г-н"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "Сэр"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Г-жа"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "Доктор"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -690,39 +755,39 @@ msgstr "Фамилия"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "Hon. suffixes"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "Уважительные суффиксы"
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "M.D."
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "D.O."
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "D.C."
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "Sn."
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -749,7 +814,6 @@ msgid "Submit"
 msgstr "Отправить"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -769,36 +833,13 @@ msgstr "создать новую адресную книгу"
 msgid "Name of new addressbook"
 msgstr "Имя новой адресной книги"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Импорт"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Импорт контактов"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr "В адресной книге есть контакты."
+msgstr "В адресной книге нет контактов."
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -808,18 +849,34 @@ msgstr "Добавить контакт"
 msgid "Configure addressbooks"
 msgstr "Настроить адресную книгу"
 
-#: templates/settings.php:4
-msgid "CardDAV syncing addresses"
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
+msgid "CardDAV syncing addresses"
+msgstr "CardDAV синхронизации адресов"
+
+#: templates/settings.php:3
 msgid "more info"
 msgstr "дополнительная информация"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Первичный адрес (Kontact и др.)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 315d1deac67cb06b3f3aab1bfbe05c87b1d40940..997362d18fa1e83435beb964d32d33bdbcace667 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -6,14 +6,15 @@
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 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-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/owncloud/language/ru/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +35,89 @@ msgstr "Эта категория уже существует: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Настройки"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Март"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Май"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Август"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Нет"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ок"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Нет категорий для удаления."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Сброс пароля OwnCloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
@@ -242,14 +247,10 @@ msgstr "Завершить установку"
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Настройки"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index b1ef507162c149842998fd3fde2cccd347f413d5..96d5af69cdd3f90c4c8b5bf3c256f8d74d0b7691 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -6,14 +6,15 @@
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -58,20 +59,40 @@ msgstr "Файлы"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Снять общий доступ"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "отмена"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "удален"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "создание ZIP-файла, это может занять некоторое время."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index aaac8ba2549a55aaee67044245f2986e66444bf0..e0e1293d2e1390c96d605a7511f50bcb7230b24f 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -7,15 +7,16 @@
 #   <icewind1991@gmail.com>, 2012.
 #   <jekader@gmail.com>, 2012.
 #   <lankme@gmail.com>, 2012.
+# Nick Remeslennikov <homolibere@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-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:15+0000\n"
+"Last-Translator: Nick Remeslennikov <homolibere@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"
@@ -41,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"
@@ -65,7 +66,7 @@ msgstr "Русский "
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Предупреждение безопасности"
 
 #: templates/admin.php:28
 msgid "Log"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index d7a7d820f89b720fb56c1e94a422dc5e7097b2f3..d4ab54e819c96de37c5351fda0105e4ba102f5d0 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-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 21:49+0000\n"
-"Last-Translator: zixo <zixo@zixo.sk>\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"
 "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"
@@ -84,20 +84,20 @@ msgstr "Chýba ID"
 msgid "Error parsing VCard for ID: \""
 msgstr "Chyba pri vyňatí ID z VCard:"
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Nebolo nastavené ID kontaktu."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Chyba pri čítaní fotky kontaktu."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Chyba pri ukladaní dočasného súboru."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Načítaná fotka je vadná."
 
@@ -125,31 +125,31 @@ msgstr "Súbor neexistuje:"
 msgid "Error loading image."
 msgstr "Chyba pri nahrávaní obrázka."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Chyba počas prevzatia objektu kontakt."
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Chyba počas získavania fotky."
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Chyba počas ukladania kontaktu."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Chyba počas zmeny obrázku."
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Chyba počas orezania obrázku."
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Chyba počas vytvárania dočasného obrázku."
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Chyba vyhľadania obrázku: "
 
@@ -181,110 +181,110 @@ msgstr "Chyba aktualizácie adresára."
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Nevyskytla sa žiadna chyba, súbor úspešne uložené."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Nemôžem uložiť dočasný obrázok: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Nemôžem načítať dočasný obrázok: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Neimplementované"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú adresu."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nový"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbor, ktorý sa pokúšate nahrať, presahuje maximálnu povolenú veľkosť."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Vybrať typ"
 
@@ -300,129 +300,129 @@ msgstr " importovaných, "
 msgid " failed."
 msgstr " zlyhaných."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adresár sa nenašiel."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Biznis"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Iné"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Otázky"
 
@@ -430,63 +430,67 @@ msgstr "Otázky"
 msgid "{name}'s Birthday"
 msgstr "Narodeniny {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Pridať Kontakt."
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importovať"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adresáre"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigácia"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Ďalší kontakt v zozname"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Predchádzajúci kontakt v zozname"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Ďalší/predošlí adresár"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Obnov zoznam kontaktov"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Pridaj nový kontakt"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Pridaj nový adresár"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Vymaž súčasný kontakt"
 
@@ -853,22 +857,22 @@ msgstr "Zadaj meno"
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Adresy pre synchronizáciu s CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "viac informácií"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Predvolená adresa (Kontakt etc)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bff7d669a11f64a1981f8f9fb005af76c7cb803c..cd00f6ca1f7d9e7421fc50d6b0f1bb9180bd4e80 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovak (Slovakia) (http://www.transifex.net/projects/p/owncloud/language/sk_SK/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "Táto kategória už existuje:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Nastavenia"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Január"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Február"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Marec"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Apríl"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Máj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Jún"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Júl"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Október"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Áno"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Obnova Owncloud hesla"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "Dokončiť inštaláciu"
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nastavenia"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 7c4437b6a2923544d8195b6d93976c968a852974..dbbe973d3fb4284ccfca8c9b9401c333990cfa43 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index cdcf17de4ed47430c3a163652572b70709b90006..6da58b6275f5f5b62c4fdc97817567a6b704e359 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.po
@@ -10,101 +10,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Napaka med (de)aktivacijo imenika."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Med dodajanjem stika je prišlo do napake"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "ime elementa ni nastavljeno."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id ni nastavljen."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Ne morem dodati prazne lastnosti."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Vsaj eno izmed polj je še potrebno izpolniti."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Poskušam dodati podvojeno lastnost:"
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "Napaka pri dodajanju informacije o stiku."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID ni bil podan"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "Napaka pri nastavljanju nadzorne vsote."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Nobena kategorija ni bila izbrana za izbris."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Ni bilo najdenih imenikov."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Ni bilo najdenih stikov."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Manjkajoč ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "Napaka pri razčlenjevanju VCard za ID: \""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Ne morem dodati imenika s praznim imenom."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Napaka pri dodajanju imenika."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Napaka pri aktiviranju imenika."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "ID stika ni bil poslan."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Napaka pri branju slike stika."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Napaka pri shranjevanju začasne datoteke."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Slika, ki se nalaga ni veljavna."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id ni nastavljen."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran."
@@ -113,328 +109,391 @@ msgstr "Informacije o vCard niso pravilne. Prosimo, če ponovno naložite stran.
 msgid "Error deleting contact property."
 msgstr "Napaka pri brisanju lastnosti stika."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Manjka ID stika."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Manjka id stika."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Pot slike ni bila poslana."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Datoteka ne obstaja:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "Napaka pri nalaganju slike."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Napaka pri pridobivanju kontakta predmeta."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Napaka pri pridobivanju lastnosti fotografije."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Napaka pri shranjevanju stika."
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Napaka pri spreminjanju velikosti slike"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Napaka pri obrezovanju slike"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Napaka pri ustvarjanju začasne slike"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "ime elementa ni nastavljeno."
+msgstr "Napaka pri iskanju datoteke: "
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "nadzorna vsota ni nastavljena."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Nekaj je šlo v franže. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Ne morem posodobiti imenika s praznim imenom."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Napaka pri posodabljanju imenika."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je bila uspešno naložena."
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je bila le delno naložena"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naložena"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Začasne slike ni bilo mogoče shraniti: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Začasne slike ni bilo mogoče naložiti: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Stiki"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Žal ta funkcionalnost še ni podprta"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Ni podprto"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Ne morem dobiti veljavnega naslova."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Stik"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Ta lastnost ne sme biti prazna"
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "Uredi ime"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Za uvoz stikov spustite VCF datoteko tukaj."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Izberite vrsto"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Rezultati: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " uvoženih, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " je spodletelo."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Imenik ni bil najden."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "To ni vaš imenik."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-pošta"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Rojstni dan"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name} - rojstni dan"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Stik"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj stik"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "Uvozi"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Imeniki"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Zapri"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Nastavi imenike"
@@ -443,11 +502,7 @@ msgstr "Nastavi imenike"
 msgid "New Address Book"
 msgstr "Nov imenik"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "Uvozi iz VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav povezava"
@@ -461,186 +516,195 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Prenesi stik"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Spustite sliko tukaj, da bi jo naložili"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Izbriši stik"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Izbriši trenutno sliko"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Spustite sliko tukaj, da bi jo naložili"
+msgid "Edit current photo"
+msgstr "Uredi trenutno sliko"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Naloži novo sliko"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "Izberi sliko iz ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format po meri, Kratko ime, Polno ime, Obratno ali Obratno z vejico"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "Uredite podrobnosti imena"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Vnesite vzdevek"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Rojstni dan"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Skupine ločite z vejicami"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Uredi skupine"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Prednosten"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Prosimo, če navedete veljaven e-poštni naslov."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Vnesite e-poštni naslov"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "E-pošta naslovnika"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Izbriši e-poštni naslov"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Vpiši telefonsko številko"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Izbriši telefonsko številko"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Uredi podrobnosti"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Opombe dodajte tukaj."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Slika profila"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Opomba"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Izbriši trenutno sliko"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Uredi trenutno sliko"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Naloži novo sliko"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Prenesi stik"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "Izberi sliko iz ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Izbriši stik"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Začasna slika je bila odstranjena iz predpomnilnika."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Uredi naslov"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Vrsta"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Poštni predal"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Razširjeno"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Mesto"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Poštna št."
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Dežela"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Uredi kategorije"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Dodaj"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Imenik"
@@ -746,7 +810,6 @@ msgid "Submit"
 msgstr "Potrdi"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -766,33 +829,10 @@ msgstr "Ustvari nov imenik"
 msgid "Name of new addressbook"
 msgstr "Ime novega imenika"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "Uvozi"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Uvažam stike"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "Izberite imenik v katerega boste uvažali:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "Izberi iz HD"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "V vašem imeniku ni stikov."
@@ -805,18 +845,34 @@ msgstr "Dodaj stik"
 msgid "Configure addressbooks"
 msgstr "Nastavi imenike"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV naslovi za sinhronizacijo"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "več informacij"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Primarni naslov (za kontakt et al)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 18d08e1a93a547f8307a6b0e9d0386b2cf97f5a5..4fc16e05df29f170328e2583aacf3c3e174f1543 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,10 +10,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/owncloud/language/sl/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,85 +34,89 @@ msgstr "Ta kategorija že obstaja:"
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "januar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "februar"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "marec"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "april"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "maj"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "junij"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "julij"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "avgust"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "september"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "november"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Prekliči"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "V redu"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Za izbris ni bila izbrana nobena kategorija."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ponastavi ownCloud geslo"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla ownCloud"
 
@@ -242,14 +246,10 @@ msgstr "Dokončaj namestitev"
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Nastavitve"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Ste pozabili vaše geslo?"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 49b3c8c317e2e775c098e4772baceb10f9b0cb70..27019afd79748d16b9720eb9fb46936c3abb7d3a 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -62,14 +62,34 @@ msgstr "Vzemi iz souporabe"
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "razveljavi"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "izbrisano"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Ustvarjam ZIP datoteko. To lahko traja nekaj časa."
@@ -184,7 +204,7 @@ msgstr "Souporaba"
 
 #: templates/index.php:51
 msgid "Download"
-msgstr "Prejmi"
+msgstr "Prenesi"
 
 #: templates/index.php:64
 msgid "Upload too large"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index c5aa568cb39fc28532f184ff2fe176129da9839b..c96ce8db6969c7fcf1706ecb35bb126b7fcddddc 100644
--- a/l10n/so/contacts.po
+++ b/l10n/so/contacts.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\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"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 17556c7d3e82af33e8182e748a229b87f92c210b..03d2be49971e5d7938dd29908b63add44e979052 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/so/files.po b/l10n/so/files.po
index 7b869f983049a838bc95114553fbafcd19ef1ed5..f8fd36a22b3af056b604fa1b7caa710963ee0aa1 100644
--- a/l10n/so/files.po
+++ b/l10n/so/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index 2ab147d01cb693c69b21e2c62bbbb6fc8a3baf01..d526bdd6da823c5ace01bfc55a21000aa29b1be7 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\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"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Подаци о вКарти су неисправни. Поново учитајте страницу."
@@ -111,231 +107,185 @@ msgstr "Подаци о вКарти су неисправни. Поново у
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Контакт"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Рођендан"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Контакт"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додај контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Адресар"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Уреди"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Преузми контакт"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Обриши контакт"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Рођендан"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Пожељан"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Преузми контакт"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Обриши контакт"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Тип"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Поштански број"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Прошири"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Улица"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Град"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Регија"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Зип код"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Земља"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Додај"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Земља"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr "Пошаљи"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index a6aac06e0fe4b967275de30b2b18162799c7dd50..f2a2095d88885b7503a6d4c7d933ca83269ad976 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/owncloud/language/sr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Подешавања"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Ресетовање лозинке за Оунклауд"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -240,14 +244,10 @@ msgstr "Заврши подешавање"
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Подешавања"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index cc98fd8895fe6a150c294ea44c23d36cb0feb42b..a6c92cc1cefb940c6b912ecb26520c0cf9e07742 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index 612bae668731dc07f1561ceeb8294f6696a66e0e..f767552e5c8f0330ae0573263be143cf986bb399 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\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"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr ""
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr ""
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
@@ -111,231 +107,185 @@ msgstr "Podaci o vKarti su neispravni. Ponovo učitajte stranicu."
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr ""
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
 msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
 msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Rođendan"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
 msgstr ""
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Poštanski broj"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Proširi"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Ulica"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Grad"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Regija"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Zip kod"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Zemlja"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr ""
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Zemlja"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index c11fdd41d6812b23d1b09b8fa660af6f3c43cff8..fd21f716a1b72ffb885a897584b5f4a570954992 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/owncloud/language/sr@latin/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Podešavanja"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -240,14 +244,10 @@ msgstr "Završi podešavanje"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Podešavanja"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 035317f6ca457775eabe881158772775e9cf69e1..f0c1194be76ef2a0c4473d25b5d535a63e69a40f 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 1d2a7f6b0aa3d6eba183deae76d3dae4e4c088bb..a786f05bf90ce26ede81214116d07a37ade0feaa 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 21:01+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\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"
 "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"
@@ -86,20 +86,20 @@ msgstr "ID saknas"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Inget kontakt-ID angavs."
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Fel uppstod när "
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Fel uppstod när temporär fil skulle sparas."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Det laddade fotot är inte giltigt."
 
@@ -127,31 +127,31 @@ msgstr "Filen existerar inte."
 msgid "Error loading image."
 msgstr "Fel uppstod när bild laddades."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Fel vid sparande av kontakt."
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Fel vid storleksförändring av bilden"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Fel vid beskärning av bilden"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Fel vid skapande av tillfällig bild"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Kunde inte hitta bild"
 
@@ -183,110 +183,110 @@ msgstr "Fel uppstod när adressbok skulle uppdateras"
 msgid "Error uploading contacts to storage."
 msgstr "Fel uppstod när kontakt skulle lagras."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var bara delvist uppladdad"
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Kunde inte spara tillfällig bild:"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Kunde inte ladda tillfällig bild:"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Tyvärr är denna funktion inte införd än"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Inte införd"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Ny"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" anropades utan typargument. Vänligen rapportera till bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du försöker ladda upp är större än den maximala storleken för filuppladdning på denna server."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Välj typ"
 
@@ -302,129 +302,129 @@ msgstr "importerad,"
 msgid " failed."
 msgstr "misslyckades."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Hittade inte adressboken"
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -432,63 +432,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr "{name}'s födelsedag"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Lägg till kontakt"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importera"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adressböcker"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Stäng"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -855,22 +859,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV synkningsadresser"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "mera information"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Primär adress (Kontakt o.a.)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index cc20278cfd31b7e0a898a1c000f38d3a7326f2f1..e836e06af441039f12ed72fcc7b2e9fbfc6a8dbd 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-29 20:37+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\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"
@@ -38,51 +38,59 @@ msgstr "Denna kategori finns redan:"
 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:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Inställningar"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr "April"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr "September"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr "November"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr "December"
 
@@ -244,10 +252,6 @@ msgstr "webbtjänster under din kontroll"
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Inställningar"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 799224c381adbf265cc1b1dbb05d5f4a2758ec6b..ae55ded4945dd3b598b21cfa599f178842518f41 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -64,14 +64,34 @@ msgstr "Sluta dela"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "ångra"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "raderad"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Gererar ZIP-fil. Det kan ta lite tid."
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 5ba1e16f7d04f1c392b804187091435765420c55..1a3b060abfccf7bb0ce3d9b2e36be4329715aa5a 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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 a3cbc60da6d4b097d960d11e9baa443c99aae798..21efc48ca956a76e1a860de96c3877ac0c0615a8 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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 2be8f276fc692a63ae36a3ca3704f9d1849bbbe0..360ad262cfcc95ae10098ebc6a1406b2826af1a0 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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"
@@ -81,20 +81,20 @@ msgstr ""
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
@@ -122,31 +122,31 @@ msgstr ""
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -178,110 +178,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -297,129 +297,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -427,63 +427,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr ""
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -850,22 +854,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a92c4d850af245379b1400b5a71e31e362758d04..e21d1b4ba219189de035d5a3c6340f8efffc9265 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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"
@@ -33,51 +33,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -239,10 +247,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr ""
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e334f679d99290b81e1fe893709fa54b6ab34407..3ad7347fdc662b839ecd8568f50c04ca629d1e14 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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"
@@ -59,14 +59,34 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 1971a7d641a1db56da281dabf20680daec8b15b4..dabcad70e5ff08e17e9705f5d20bd2f94e1f73c7 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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 5c59b1364771e429c1658be8d21ceda7d9ec1dad..bb922b56c85de5cc9e5cadaf26165da2b089e4d9 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-07-30 02:03+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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/media.pot b/l10n/templates/media.pot
index adf07f571b349bb22f1690acb965ca4796e89922..6f0c62cf2d7c023b457556306773775570eb52b7 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-07-30 02:02+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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 e3e49ed11a930bf200eb085c1b63184eef49857c..de250242d3caccf7d074235b41fe918733e10a1f 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-07-30 02:03+0200\n"
+"POT-Creation-Date: 2012-07-31 22:53+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/contacts.po b/l10n/th_TH/contacts.po
index c97c27d4e9a5ecf681d337e5968322dd366cd1ba..fbaf36dfc91e04435c347b0e3b77dd9fa165b49b 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,101 +9,97 @@ 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:14+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-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"
+"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"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "ยังไม่ได้กำหนดชื่อ"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "ยังไม่ได้กำหนดรหัส"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "ไม่สามารถเพิ่มรายละเอียดที่ไม่มีข้อมูลได้"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "อย่างน้อยที่สุดช่องข้อมูลที่อยู่จะต้องถูกกรอกลงไป"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "เกิดข้อผิดพลาดในการเพิ่มรายละเอียดการติดต่อ"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ยังไม่ได้ใส่รหัส"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "เกิดข้อผิดพลาดในการตั้งค่า checksum"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "ไม่พบข้อมูลการติดต่อที่ต้องการ"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "รหัสสูญหาย"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "พบข้อผิดพลาดในการแยกรหัส VCard:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "ไม่สามารถเพิ่มสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "เกิดข้อผิดพลาดในการเพิ่มสมุดบันทึกที่อยู่ใหม่"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "เกิดข้อผิดพลาดในการเปิดใช้งานสมุดบันทึกที่อยู่"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "โหลดรูปภาพไม่ถูกต้อง"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "ยังไม่ได้กำหนดรหัส"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง"
@@ -112,328 +108,391 @@ msgstr "ข้อมูลเกี่ยวกับ vCard ไม่ถูก
 msgid "Error deleting contact property."
 msgstr "เกิดข้อผิดพลาดในการลบรายละเอียดการติดต่อ"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "รหัสข้อมูลการติดต่อเกิดการสูญหาย"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "ไม่พบตำแหน่งพาธของรูปภาพ"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "ไม่มีไฟล์ดังกล่าว"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "เกิดข้อผิดพลาดในการโหลดรูปภาพ"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการดึงข้อมูลติดต่อ"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการดึงคุณสมบัติของรูปภาพ"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการบันทึกข้อมูลผู้ติดต่อ"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการครอบตัดภาพ"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
-
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "ยังไม่ได้กำหนดชื่อ"
+msgstr "เกิดข้อผิดพลาดในการค้นหารูปภาพ: "
 
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "ยังไม่ได้กำหนดค่า checksum"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "ข้อมูล vCard ไม่ถูกต้อง กรุณาโหลดหน้าเว็บใหม่อีกครั้ง: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "มีบางอย่างเกิดการ FUBAR. "
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทข้อมูลการติดต่อ"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง upload_max_filesize ที่อยู่ในไฟล์ php.ini"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "ไม่สามารถบันทึกรูปภาพชั่วคราวได้: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "ไม่สามารถโหลดรูปภาพชั่วคราวได้: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "ไม่สามารถดึงที่อยู่ที่ถูกต้องได้"
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "พบข้อผิดพลาด"
+
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "วางไฟล์ VCF ที่ต้องการนำเข้าข้อมูลการติดต่อ"
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "เลือกชนิด"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "ผลลัพธ์: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " นำเข้าข้อมูลแล้ว, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " ล้มเหลว."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "หน่วยงาน"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "มือถือ"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "ข้อความ"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "เสียงพูด"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "ข้อความ"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "วีดีโอ"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "เพจเจอร์"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "วันเกิด"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "วันเกิดของ {name}"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "ข้อมูลการติดต่อ"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "เพิ่มรายชื่อผู้ติดต่อใหม่"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "นำเข้า"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "สมุดบันทึกที่อยู่"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "ปิด"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
@@ -442,11 +501,7 @@ msgstr "กำหนดค่าสมุดบันทึกที่อยู
 msgid "New Address Book"
 msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "นำเข้าจาก VCF"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "ลิงค์ CardDav"
@@ -460,186 +515,195 @@ msgid "Edit"
 msgstr "แก้ไข"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "วางรูปภาพที่ต้องการอัพโหลด"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "ลบข้อมูลการติดต่อ"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "ลบรูปภาพปัจจุบัน"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "วางรูปภาพที่ต้องการอัพโหลด"
+msgid "Edit current photo"
+msgstr "แก้ไขรูปภาพปัจจุบัน"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "อัพโหลดรูปภาพใหม่"
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "เลือกรูปภาพจาก ownCloud"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "แก้ไขรายละเอียดของชื่อ"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "กรอกชื่อเล่น"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "วันเกิด"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "แก้ไขกลุ่ม"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "พิเศษ"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "กรอกที่อยู่อีเมล"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "ส่งอีเมลไปที่"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "ลบที่อยู่อีเมล"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "กรอกหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "ลบหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "ดูบนแผนที่"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "แก้ไขรายละเอียดที่อยู่"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "เพิ่มช่องรับข้อมูล"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "รูปภาพโปรไฟล์"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "โทรศัพท์"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "หมายเหตุ"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "ลบรูปภาพปัจจุบัน"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "แก้ไขรูปภาพปัจจุบัน"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "อัพโหลดรูปภาพใหม่"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "เลือกรูปภาพจาก ownCloud"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "ลบข้อมูลการติดต่อ"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "รูปภาพชั่วคราวดังกล่าวได้ถูกลบออกจากหน่วยความจำแคชแล้ว"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "แก้ไขที่อยู่"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "ประเภท"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "ตู้ ปณ."
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "เพิ่ม"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "ถนน"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "เมือง"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "ภูมิภาค"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "รหัสไปรษณีย์"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "ประเทศ"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "แก้ไขหมวดหมู่"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "เพิ่ม"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "สมุดบันทึกที่อยู่"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "ส่งข้อมูล"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -765,33 +828,10 @@ msgstr "สร้างสมุดบันทึกที่อยู่ให
 msgid "Name of new addressbook"
 msgstr "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "นำเข้า"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "นำเข้าข้อมูลการติดต่อ"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "เลือกสมุดบันทึกที่อยู่ที่ต้องการนำเข้า:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "เลือกจากฮาร์ดดิส"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ"
@@ -804,18 +844,34 @@ msgstr "เพิ่มชื่อผู้ติดต่อ"
 msgid "Configure addressbooks"
 msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "ข้อมูลเพิ่มเติม"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "ที่อยู่หลัก (สำหรับติดต่อ)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 43e255b71f5f65c9840e0893c3f2d792058f4b7f..229c958879359786827e92d635fe4c0e6c4851d6 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,10 +9,10 @@ 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:14+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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,85 +33,89 @@ msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "ตั้งค่า"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "มกราคม"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "กุมภาพันธ์"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "มีนาคม"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "เมษายน"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "พฤษภาคม"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "มิถุนายน"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "กรกฏาคม"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "สิงหาคม"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "กันยายน"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "ตุลาคม"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "พฤศจิกายน"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "ธันวาคม"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "ไม่ตกลง"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "ตกลง"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "ตกลง"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "พบข้อผิดพลาด"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "เปลี่ยนรหัสผ่านใน Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 
@@ -241,14 +245,10 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "ตั้งค่า"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 6425a4d7c6410d159531453191f9c0a6a884a744..f1966051f32b6c1ac9f6306ebb789b5dca903438 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
diff --git a/l10n/tr/calendar.po b/l10n/tr/calendar.po
index 65932f70ee3bd50d43c07ee534061828845973c5..90156adadf0fd848202d979ef40b5960fdc923fa 100644
--- a/l10n/tr/calendar.po
+++ b/l10n/tr/calendar.po
@@ -5,26 +5,36 @@
 # Translators:
 #   <ahmet_kaplan@hotmail.com>, 2012.
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
+#   <mesutgungor@iyte.edu.tr>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 06:05+0000\n"
+"Last-Translator: mesutgungor <mesutgungor@iyte.edu.tr>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/categories/rescan.php:28
+#: ajax/cache/status.php:19
+msgid "Not all calendars are completely cached"
+msgstr "Bütün takvimler tamamen  ön belleğe alınmadı"
+
+#: ajax/cache/status.php:21
+msgid "Everything seems to be completely cached"
+msgstr "Bütün herşey tamamen ön belleğe alınmış görünüyor"
+
+#: ajax/categories/rescan.php:29
 msgid "No calendars found."
 msgstr "Takvim yok."
 
-#: ajax/categories/rescan.php:36
+#: ajax/categories/rescan.php:37
 msgid "No events found."
 msgstr "Etkinlik yok."
 
@@ -32,43 +42,57 @@ msgstr "Etkinlik yok."
 msgid "Wrong calendar"
 msgstr "Yanlış takvim"
 
+#: ajax/import/dropimport.php:29 ajax/import/import.php:64
+msgid ""
+"The file contained either no events or all events are already saved in your "
+"calendar."
+msgstr "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı."
+
+#: ajax/import/dropimport.php:31 ajax/import/import.php:67
+msgid "events has been saved in the new calendar"
+msgstr "Etkinlikler yeni takvimde saklandı"
+
+#: ajax/import/import.php:56
+msgid "Import failed"
+msgstr "İçeri aktarma başarısız oldu."
+
+#: ajax/import/import.php:69
+msgid "events has been saved in your calendar"
+msgstr "Etkinlikler takviminizde saklandı"
+
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
 msgstr "Yeni Zamandilimi:"
 
-#: ajax/settings/settimezone.php:22
+#: ajax/settings/settimezone.php:23
 msgid "Timezone changed"
 msgstr "Zaman dilimi değiştirildi"
 
-#: ajax/settings/settimezone.php:24
+#: ajax/settings/settimezone.php:25
 msgid "Invalid request"
 msgstr "Geçersiz istek"
 
-#: appinfo/app.php:19 templates/calendar.php:15
-#: templates/part.eventform.php:33 templates/part.showevent.php:31
+#: appinfo/app.php:35 templates/calendar.php:15
+#: templates/part.eventform.php:33 templates/part.showevent.php:33
 #: templates/settings.php:12
 msgid "Calendar"
 msgstr "Takvim"
 
-#: js/calendar.js:93
-msgid "Deletion failed"
-msgstr ""
-
 #: js/calendar.js:828
 msgid "ddd"
-msgstr ""
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr ""
+msgstr "ddd M/d"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr ""
+msgstr "dddd M/d"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr ""
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -76,256 +100,337 @@ msgstr "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr ""
+msgstr "dddd, MMM d, yyyy"
 
-#: lib/app.php:125
+#: lib/app.php:121
 msgid "Birthday"
 msgstr "Doğum günü"
 
-#: lib/app.php:126
+#: lib/app.php:122
 msgid "Business"
 msgstr "İş"
 
-#: lib/app.php:127
+#: lib/app.php:123
 msgid "Call"
 msgstr "Arama"
 
-#: lib/app.php:128
+#: lib/app.php:124
 msgid "Clients"
 msgstr "Müşteriler"
 
-#: lib/app.php:129
+#: lib/app.php:125
 msgid "Deliverer"
 msgstr "Teslimatçı"
 
-#: lib/app.php:130
+#: lib/app.php:126
 msgid "Holidays"
 msgstr "Tatil günleri"
 
-#: lib/app.php:131
+#: lib/app.php:127
 msgid "Ideas"
 msgstr "Fikirler"
 
-#: lib/app.php:132
+#: lib/app.php:128
 msgid "Journey"
 msgstr "Seyahat"
 
-#: lib/app.php:133
+#: lib/app.php:129
 msgid "Jubilee"
 msgstr "Yıl dönümü"
 
-#: lib/app.php:134
+#: lib/app.php:130
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: lib/app.php:135
+#: lib/app.php:131
 msgid "Other"
 msgstr "Diğer"
 
-#: lib/app.php:136
+#: lib/app.php:132
 msgid "Personal"
 msgstr "Kişisel"
 
-#: lib/app.php:137
+#: lib/app.php:133
 msgid "Projects"
 msgstr "Projeler"
 
-#: lib/app.php:138
+#: lib/app.php:134
 msgid "Questions"
 msgstr "Sorular"
 
-#: lib/app.php:139
+#: lib/app.php:135
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:380
+#: lib/app.php:351 lib/app.php:361
+msgid "by"
+msgstr "hazırlayan"
+
+#: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
 msgstr "isimsiz"
 
-#: lib/object.php:330
+#: lib/import.php:184 templates/calendar.php:12
+#: templates/part.choosecalendar.php:22
+msgid "New Calendar"
+msgstr "Yeni Takvim"
+
+#: lib/object.php:372
 msgid "Does not repeat"
 msgstr "Tekrar etmiyor"
 
-#: lib/object.php:331
+#: lib/object.php:373
 msgid "Daily"
 msgstr "Günlük"
 
-#: lib/object.php:332
+#: lib/object.php:374
 msgid "Weekly"
 msgstr "Haftalı"
 
-#: lib/object.php:333
+#: lib/object.php:375
 msgid "Every Weekday"
 msgstr "Haftaiçi Her gün"
 
-#: lib/object.php:334
+#: lib/object.php:376
 msgid "Bi-Weekly"
 msgstr "İki haftada bir"
 
-#: lib/object.php:335
+#: lib/object.php:377
 msgid "Monthly"
 msgstr "Aylık"
 
-#: lib/object.php:336
+#: lib/object.php:378
 msgid "Yearly"
 msgstr "Yıllı"
 
-#: lib/object.php:343
+#: lib/object.php:388
 msgid "never"
 msgstr "asla"
 
-#: lib/object.php:344
+#: lib/object.php:389
 msgid "by occurrences"
 msgstr "sıklığa göre"
 
-#: lib/object.php:345
+#: lib/object.php:390
 msgid "by date"
 msgstr "tarihe göre"
 
-#: lib/object.php:352
+#: lib/object.php:400
 msgid "by monthday"
 msgstr "ay günlerine göre"
 
-#: lib/object.php:353
+#: lib/object.php:401
 msgid "by weekday"
 msgstr "hafta günlerine göre"
 
-#: lib/object.php:360 templates/settings.php:42
+#: lib/object.php:411 templates/calendar.php:5 templates/settings.php:42
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: lib/object.php:361
+#: lib/object.php:412 templates/calendar.php:5
 msgid "Tuesday"
 msgstr "Salı"
 
-#: lib/object.php:362
+#: lib/object.php:413 templates/calendar.php:5
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: lib/object.php:363
+#: lib/object.php:414 templates/calendar.php:5
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: lib/object.php:364
+#: lib/object.php:415 templates/calendar.php:5
 msgid "Friday"
 msgstr "Cuma"
 
-#: lib/object.php:365
+#: lib/object.php:416 templates/calendar.php:5
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: lib/object.php:366 templates/settings.php:43
+#: lib/object.php:417 templates/calendar.php:5 templates/settings.php:43
 msgid "Sunday"
 msgstr "Pazar"
 
-#: lib/object.php:373
+#: lib/object.php:427
 msgid "events week of month"
 msgstr "ayın etkinlikler haftası"
 
-#: lib/object.php:374
+#: lib/object.php:428
 msgid "first"
 msgstr "birinci"
 
-#: lib/object.php:375
+#: lib/object.php:429
 msgid "second"
 msgstr "ikinci"
 
-#: lib/object.php:376
+#: lib/object.php:430
 msgid "third"
 msgstr "üçüncü"
 
-#: lib/object.php:377
+#: lib/object.php:431
 msgid "fourth"
 msgstr "dördüncü"
 
-#: lib/object.php:378
+#: lib/object.php:432
 msgid "fifth"
 msgstr "beşinci"
 
-#: lib/object.php:379
+#: lib/object.php:433
 msgid "last"
 msgstr "sonuncu"
 
-#: lib/object.php:401
+#: lib/object.php:467 templates/calendar.php:7
 msgid "January"
 msgstr "Ocak"
 
-#: lib/object.php:402
+#: lib/object.php:468 templates/calendar.php:7
 msgid "February"
 msgstr "Şubat"
 
-#: lib/object.php:403
+#: lib/object.php:469 templates/calendar.php:7
 msgid "March"
 msgstr "Mart"
 
-#: lib/object.php:404
+#: lib/object.php:470 templates/calendar.php:7
 msgid "April"
 msgstr "Nisan"
 
-#: lib/object.php:405
+#: lib/object.php:471 templates/calendar.php:7
 msgid "May"
 msgstr "Mayıs"
 
-#: lib/object.php:406
+#: lib/object.php:472 templates/calendar.php:7
 msgid "June"
 msgstr "Haziran"
 
-#: lib/object.php:407
+#: lib/object.php:473 templates/calendar.php:7
 msgid "July"
 msgstr "Temmuz"
 
-#: lib/object.php:408
+#: lib/object.php:474 templates/calendar.php:7
 msgid "August"
 msgstr "Ağustos"
 
-#: lib/object.php:409
+#: lib/object.php:475 templates/calendar.php:7
 msgid "September"
 msgstr "Eylül"
 
-#: lib/object.php:410
+#: lib/object.php:476 templates/calendar.php:7
 msgid "October"
 msgstr "Ekim"
 
-#: lib/object.php:411
+#: lib/object.php:477 templates/calendar.php:7
 msgid "November"
 msgstr "Kasım"
 
-#: lib/object.php:412
+#: lib/object.php:478 templates/calendar.php:7
 msgid "December"
 msgstr "Aralık"
 
-#: lib/object.php:418
+#: lib/object.php:488
 msgid "by events date"
 msgstr "olay tarihine göre"
 
-#: lib/object.php:419
+#: lib/object.php:489
 msgid "by yearday(s)"
 msgstr "yıl gün(ler)ine göre"
 
-#: lib/object.php:420
+#: lib/object.php:490
 msgid "by weeknumber(s)"
 msgstr "hafta sayı(lar)ına göre"
 
-#: lib/object.php:421
+#: lib/object.php:491
 msgid "by day and month"
 msgstr "gün ve aya göre"
 
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
+#: lib/search.php:35 lib/search.php:37 lib/search.php:40
 msgid "Date"
 msgstr "Tarih"
 
-#: lib/search.php:40
+#: lib/search.php:43
 msgid "Cal."
 msgstr "Takv."
 
+#: templates/calendar.php:6
+msgid "Sun."
+msgstr "Paz."
+
+#: templates/calendar.php:6
+msgid "Mon."
+msgstr "Pzt."
+
+#: templates/calendar.php:6
+msgid "Tue."
+msgstr "Sal."
+
+#: templates/calendar.php:6
+msgid "Wed."
+msgstr "Çar."
+
+#: templates/calendar.php:6
+msgid "Thu."
+msgstr "Per."
+
+#: templates/calendar.php:6
+msgid "Fri."
+msgstr "Cum."
+
+#: templates/calendar.php:6
+msgid "Sat."
+msgstr "Cmt."
+
+#: templates/calendar.php:8
+msgid "Jan."
+msgstr "Oca."
+
+#: templates/calendar.php:8
+msgid "Feb."
+msgstr "Şbt."
+
+#: templates/calendar.php:8
+msgid "Mar."
+msgstr "Mar."
+
+#: templates/calendar.php:8
+msgid "Apr."
+msgstr "Nis"
+
+#: templates/calendar.php:8
+msgid "May."
+msgstr "May."
+
+#: templates/calendar.php:8
+msgid "Jun."
+msgstr "Haz."
+
+#: templates/calendar.php:8
+msgid "Jul."
+msgstr "Tem."
+
+#: templates/calendar.php:8
+msgid "Aug."
+msgstr "Agu."
+
+#: templates/calendar.php:8
+msgid "Sep."
+msgstr "Eyl."
+
+#: templates/calendar.php:8
+msgid "Oct."
+msgstr "Eki."
+
+#: templates/calendar.php:8
+msgid "Nov."
+msgstr "Kas."
+
+#: templates/calendar.php:8
+msgid "Dec."
+msgstr "Ara."
+
 #: templates/calendar.php:11
 msgid "All day"
 msgstr "Tüm gün"
 
-#: templates/calendar.php:12 templates/part.choosecalendar.php:22
-msgid "New Calendar"
-msgstr "Yeni Takvim"
-
 #: templates/calendar.php:13
 msgid "Missing fields"
 msgstr "Eksik alanlar"
@@ -359,27 +464,27 @@ msgstr "Olay başlamadan önce bitiyor"
 msgid "There was a database fail"
 msgstr "Bir veritabanı başarısızlığı oluştu"
 
-#: templates/calendar.php:40
+#: templates/calendar.php:38
 msgid "Week"
 msgstr "Hafta"
 
-#: templates/calendar.php:41
+#: templates/calendar.php:39
 msgid "Month"
 msgstr "Ay"
 
-#: templates/calendar.php:42
+#: templates/calendar.php:40
 msgid "List"
 msgstr "Liste"
 
-#: templates/calendar.php:48
+#: templates/calendar.php:44
 msgid "Today"
 msgstr "Bugün"
 
-#: templates/calendar.php:49
+#: templates/calendar.php:45
 msgid "Calendars"
 msgstr "Takvimler"
 
-#: templates/calendar.php:67
+#: templates/calendar.php:59
 msgid "There was a fail, while parsing the file."
 msgstr "Dosya okunurken başarısızlık oldu."
 
@@ -392,7 +497,7 @@ msgid "Your calendars"
 msgstr "Takvimleriniz"
 
 #: templates/part.choosecalendar.php:27
-#: templates/part.choosecalendar.rowfields.php:5
+#: templates/part.choosecalendar.rowfields.php:11
 msgid "CalDav Link"
 msgstr "CalDav Bağlantısı"
 
@@ -404,19 +509,19 @@ msgstr "Paylaşılan"
 msgid "No shared calendars"
 msgstr "Paylaşılan takvim yok"
 
-#: templates/part.choosecalendar.rowfields.php:4
+#: templates/part.choosecalendar.rowfields.php:8
 msgid "Share Calendar"
 msgstr "Takvimi paylaş"
 
-#: templates/part.choosecalendar.rowfields.php:6
+#: templates/part.choosecalendar.rowfields.php:14
 msgid "Download"
 msgstr "İndir"
 
-#: templates/part.choosecalendar.rowfields.php:7
+#: templates/part.choosecalendar.rowfields.php:17
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/part.choosecalendar.rowfields.php:8
+#: templates/part.choosecalendar.rowfields.php:20
 #: templates/part.editevent.php:9
 msgid "Delete"
 msgstr "Sil"
@@ -502,23 +607,23 @@ msgstr "Kategorileri virgülle ayırın"
 msgid "Edit categories"
 msgstr "Kategorileri düzenle"
 
-#: templates/part.eventform.php:56 templates/part.showevent.php:55
+#: templates/part.eventform.php:56 templates/part.showevent.php:52
 msgid "All Day Event"
 msgstr "Tüm Gün Olay"
 
-#: templates/part.eventform.php:60 templates/part.showevent.php:59
+#: templates/part.eventform.php:60 templates/part.showevent.php:56
 msgid "From"
 msgstr "Kimden"
 
-#: templates/part.eventform.php:68 templates/part.showevent.php:67
+#: templates/part.eventform.php:68 templates/part.showevent.php:64
 msgid "To"
 msgstr "Kime"
 
-#: templates/part.eventform.php:76 templates/part.showevent.php:75
+#: templates/part.eventform.php:76 templates/part.showevent.php:72
 msgid "Advanced options"
 msgstr "Gelişmiş opsiyonlar"
 
-#: templates/part.eventform.php:81 templates/part.showevent.php:80
+#: templates/part.eventform.php:81 templates/part.showevent.php:77
 msgid "Location"
 msgstr "Konum"
 
@@ -526,7 +631,7 @@ msgstr "Konum"
 msgid "Location of the Event"
 msgstr "Olayın Konumu"
 
-#: templates/part.eventform.php:89 templates/part.showevent.php:88
+#: templates/part.eventform.php:89 templates/part.showevent.php:85
 msgid "Description"
 msgstr "Açıklama"
 
@@ -534,84 +639,86 @@ msgstr "Açıklama"
 msgid "Description of the Event"
 msgstr "Olayın Açıklaması"
 
-#: templates/part.eventform.php:100 templates/part.showevent.php:98
+#: templates/part.eventform.php:100 templates/part.showevent.php:95
 msgid "Repeat"
 msgstr "Tekrar"
 
-#: templates/part.eventform.php:107 templates/part.showevent.php:105
+#: templates/part.eventform.php:107 templates/part.showevent.php:102
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: templates/part.eventform.php:151 templates/part.showevent.php:149
+#: templates/part.eventform.php:151 templates/part.showevent.php:146
 msgid "Select weekdays"
 msgstr "Hafta günlerini seçin"
 
 #: templates/part.eventform.php:164 templates/part.eventform.php:177
-#: templates/part.showevent.php:162 templates/part.showevent.php:175
+#: templates/part.showevent.php:159 templates/part.showevent.php:172
 msgid "Select days"
 msgstr "Günleri seçin"
 
-#: templates/part.eventform.php:169 templates/part.showevent.php:167
+#: templates/part.eventform.php:169 templates/part.showevent.php:164
 msgid "and the events day of year."
 msgstr "ve yılın etkinlikler günü."
 
-#: templates/part.eventform.php:182 templates/part.showevent.php:180
+#: templates/part.eventform.php:182 templates/part.showevent.php:177
 msgid "and the events day of month."
 msgstr "ve ayın etkinlikler günü."
 
-#: templates/part.eventform.php:190 templates/part.showevent.php:188
+#: templates/part.eventform.php:190 templates/part.showevent.php:185
 msgid "Select months"
 msgstr "Ayları seç"
 
-#: templates/part.eventform.php:203 templates/part.showevent.php:201
+#: templates/part.eventform.php:203 templates/part.showevent.php:198
 msgid "Select weeks"
 msgstr "Haftaları seç"
 
-#: templates/part.eventform.php:208 templates/part.showevent.php:206
+#: templates/part.eventform.php:208 templates/part.showevent.php:203
 msgid "and the events week of year."
 msgstr "ve yılın etkinkinlikler haftası."
 
-#: templates/part.eventform.php:214 templates/part.showevent.php:212
+#: templates/part.eventform.php:214 templates/part.showevent.php:209
 msgid "Interval"
 msgstr "Aralık"
 
-#: templates/part.eventform.php:220 templates/part.showevent.php:218
+#: templates/part.eventform.php:220 templates/part.showevent.php:215
 msgid "End"
 msgstr "Son"
 
-#: templates/part.eventform.php:233 templates/part.showevent.php:231
+#: templates/part.eventform.php:233 templates/part.showevent.php:228
 msgid "occurrences"
 msgstr "olaylar"
 
-#: templates/part.import.php:1
+#: templates/part.import.php:14
+msgid "create a new calendar"
+msgstr "Yeni bir takvim oluştur"
+
+#: templates/part.import.php:17
 msgid "Import a calendar file"
 msgstr "Takvim dosyasını içeri aktar"
 
-#: templates/part.import.php:6
-msgid "Please choose the calendar"
-msgstr "Lütfen takvimi seçin"
-
-#: templates/part.import.php:10
-msgid "create a new calendar"
-msgstr "Yeni bir takvim oluştur"
+#: templates/part.import.php:24
+msgid "Please choose a calendar"
+msgstr "Lütfen takvim seçiniz"
 
-#: templates/part.import.php:15
+#: templates/part.import.php:36
 msgid "Name of new calendar"
 msgstr "Yeni takvimin adı"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "İçe Al"
+#: templates/part.import.php:44
+msgid "Take an available name!"
+msgstr "Müsait ismi al !"
 
-#: templates/part.import.php:20
-msgid "Importing calendar"
-msgstr "Takvim içe aktarılıyor"
+#: templates/part.import.php:45
+msgid ""
+"A Calendar with this name already exists. If you continue anyhow, these "
+"calendars will be merged."
+msgstr "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir."
 
-#: templates/part.import.php:23
-msgid "Calendar imported successfully"
-msgstr "Takvim başarıyla içe aktarıldı"
+#: templates/part.import.php:47
+msgid "Import"
+msgstr "İçe Al"
 
-#: templates/part.import.php:24
+#: templates/part.import.php:56
 msgid "Close Dialog"
 msgstr "Diyalogu kapat"
 
@@ -627,15 +734,11 @@ msgstr "Bir olay görüntüle"
 msgid "No categories selected"
 msgstr "Kategori seçilmedi"
 
-#: templates/part.showevent.php:25
-msgid "Select category"
-msgstr "Kategori seçin"
-
 #: templates/part.showevent.php:37
 msgid "of"
 msgstr "nın"
 
-#: templates/part.showevent.php:62 templates/part.showevent.php:70
+#: templates/part.showevent.php:59 templates/part.showevent.php:67
 msgid "at"
 msgstr "üzerinde"
 
@@ -663,9 +766,33 @@ msgstr "12s"
 msgid "First day of the week"
 msgstr "Haftanın ilk günü"
 
-#: templates/settings.php:49
-msgid "Calendar CalDAV syncing address:"
-msgstr "CalDAV Takvim eşzamanlama adresi:"
+#: templates/settings.php:47
+msgid "Cache"
+msgstr "Önbellek"
+
+#: templates/settings.php:48
+msgid "Clear cache for repeating events"
+msgstr "Tekrar eden etkinlikler için ön belleği temizle."
+
+#: templates/settings.php:53
+msgid "Calendar CalDAV syncing addresses"
+msgstr "CalDAV takvimi adresleri senkronize ediyor."
+
+#: templates/settings.php:53
+msgid "more info"
+msgstr "daha fazla bilgi"
+
+#: templates/settings.php:55
+msgid "Primary address (Kontact et al)"
+msgstr "Öncelikli adres"
+
+#: templates/settings.php:57
+msgid "iOS/OS X"
+msgstr "iOS/OS X"
+
+#: templates/settings.php:59
+msgid "Read only iCalendar link(s)"
+msgstr "Sadece okunabilir iCalendar link(ler)i"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index ca306b53c25cf568787959f1adc5e877b8bde2a3..041e00bf18bee4d788c83bd3731e9dd8b7af1115 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.po
@@ -4,106 +4,103 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+#   <mesutgungor@iyte.edu.tr>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\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"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "Adres defteri etkisizleştirilirken hata oluştu."
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Kişi eklenirken hata oluştu."
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "eleman ismi atanmamış."
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "id atanmamış."
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr "Kişi bilgisi ayrıştırılamadı."
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "Boş özellik eklenemiyor."
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "En az bir adres alanı doldurulmalı."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID verilmedi"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "İmza oluşturulurken hata."
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "Silmek için bir kategori seçilmedi."
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "Adres defteri bulunamadı."
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "Bağlantı bulunamadı."
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "Eksik ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "ID için VCard ayrıştırılamadı:\""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "Adres defterini isimsiz ekleyemezsiniz."
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Adres defteri eklenirken hata oluştu."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "Adres defteri etkinleştirilirken hata oluştu."
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Bağlantı ID'si girilmedi."
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Bağlantı fotoğrafı okunamadı."
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Geçici dosya kaydetme hatası."
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Yüklenecek fotograf geçerli değil."
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "id atanmamış."
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
@@ -112,328 +109,391 @@ msgstr "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin."
 msgid "Error deleting contact property."
 msgstr "Kişi özelliği silinirken hata oluştu."
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "Bağlantı ID'si eksik."
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "Eksik bağlantı id'si."
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "Fotoğraf girilmedi."
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "Dosya mevcut değil:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "İmaj yükleme hatası."
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Bağlantı nesnesini kaydederken hata."
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Resim özelleğini alırken hata oluştu."
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "Bağlantıyı kaydederken hata"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "Görüntü yeniden boyutlandırılamadı."
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "Görüntü kırpılamadı."
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Geçici resim oluştururken hata oluştu"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "Resim ararken hata oluştu:"
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr "eleman ismi atanmamış."
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "checksum atanmamış."
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr "vCard hakkındaki bilgi hatalı. Lütfen sayfayı yeniden yükleyin: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr "Bir şey FUBAR gitti."
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "Adres defteri güncellenirken hata oluştu."
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Geçici resmi saklayamadı : "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Geçici resmi yükleyemedi :"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Üzgünüz, bu özellik henüz tamamlanmadı."
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "Tamamlanmadı."
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "Geçerli bir adres alınamadı."
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
-msgstr ""
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "Kişi"
 
-#: js/contacts.js:364
-msgid "Warning"
-msgstr ""
+#: js/contacts.js:400
+msgid "New"
+msgstr "Yeni"
 
-#: js/contacts.js:605
+#: js/contacts.js:400
+msgid "New Contact"
+msgstr "Yeni Kişi"
+
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Bu özellik boş bırakılmamalı."
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "İsmi düzenle"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr "Bağlantıları içe aktarmak için bir VCF dosyası bırakın."
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "Tür seç"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Sonuç: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " içe aktarıldı, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " hatalı."
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Adres defteri bulunamadı."
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz değil."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "mesaj"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "İnternet"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "Doğum günü"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr "İş"
+
+#: lib/app.php:182
+msgid "Call"
+msgstr "Çağrı"
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr "Müşteriler"
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr "Dağıtıcı"
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr "Tatiller"
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr "Fikirler"
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr "Seyahat"
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr "Yıl Dönümü"
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr "Toplantı"
+
+#: lib/app.php:190
+msgid "Other"
+msgstr "Diğer"
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr "Kişisel"
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr "Projeler"
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr "Sorular"
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}'nin Doğumgünü"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "Kişi"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Kişi Ekle"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "İçe aktar"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Adres defterleri"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "Kapat"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr "Klavye kısayolları"
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr "Dolaşım"
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr "Listedeki sonraki kişi"
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr "Listedeki önceki kişi"
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr "Şuanki adres defterini genişlet/daralt"
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr "Sonraki/Önceki adres defteri"
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr "Eylemler"
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr "Kişi listesini tazele"
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr "Yeni kişi ekle"
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr "Yeni adres defteri ekle"
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr "Şuanki kişiyi sil"
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "Adres Defterlerini Yapılandır"
@@ -442,11 +502,7 @@ msgstr "Adres Defterlerini Yapılandır"
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "VCF'den içeri aktar"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav Bağlantısı"
@@ -460,186 +516,195 @@ msgid "Edit"
 msgstr "Düzenle"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "Kişiyi indir"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "Fotoğrafı yüklenmesi için bırakın"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Kişiyi sil"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "Mevcut fotoğrafı sil"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "Fotoğrafı yüklenmesi için bırakın"
+msgid "Edit current photo"
+msgstr "Mevcut fotoğrafı düzenle"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "Yeni fotoğraf yükle"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "ownCloud'dan bir fotoğraf seç"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Biçin özel, Kısa isim, Tam isim, Ters veya noktalı ters"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "İsim detaylarını düzenle"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "Takma adı girin"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "Doğum günü"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr "Web sitesi"
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr "Web sitesine git"
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "gg-aa-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "Grupları birbirinden virgülle ayırın"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "Grupları düzenle"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "Tercih edilen"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "Lütfen geçerli bir eposta adresi belirtin."
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "Eposta adresini girin"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "Eposta adresi"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "Eposta adresini sil"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "Telefon numarasını gir"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "Telefon numarasını sil"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "Haritada gör"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "Adres detaylarını düzenle"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "Notları buraya ekleyin."
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "Alan ekle"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "Profil resmi"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "Not"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "Mevcut fotoğrafı sil"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "Mevcut fotoğrafı düzenle"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "Yeni fotoğraf yükle"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "Kişiyi indir"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "ownCloud'dan bir fotoğraf seç"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Kişiyi sil"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Geçici resim ön bellekten silinmiştir."
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "Adresi düzenle"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "Tür"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "Posta Kutusu"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr "Sokak adresi"
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr "Sokak ve Numara"
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Uzatılmış"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Sokak"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr "Apartman numarası vb."
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Şehir"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "Bölge"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr "Örn. eyalet veya il"
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Posta kodu"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr "Posta kodu"
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "Ülke"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "Kategorileri düzenle"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Ekle"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "Adres defteri"
@@ -745,7 +810,6 @@ msgid "Submit"
 msgstr "Gönder"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "İptal"
 
@@ -765,33 +829,10 @@ msgstr "Yeni adres defteri oluştur"
 msgid "Name of new addressbook"
 msgstr "Yeni adres defteri için isim"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "İçe aktar"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "Bağlantıları içe aktar"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr "İçe aktarılacak adres defterini seçin:"
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr "HD'den seç"
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr "Adres defterinizde hiç bağlantı yok."
@@ -804,18 +845,34 @@ msgstr "Bağlatı ekle"
 msgid "Configure addressbooks"
 msgstr "Adres defterini yapılandır"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr "Adres deftelerini seçiniz"
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr "İsim giriniz"
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr "Tanım giriniz"
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV adresleri eşzamanlıyor"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "daha fazla bilgi"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Birincil adres (Bağlantı ve arkadaşları)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr "Sadece okunabilir vCard dizin link(ler)i"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index ac6e6dec29c95e9799b52814b7ffc6133b3dcf12..4f27a0126c6f1178fc6a8e937aba3d3d37d1d276 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +33,89 @@ msgstr "Bu kategori zaten mevcut: "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 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
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Hayır"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Evet"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Silmek için bir kategori seçilmedi"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Owncloud parola sıfırlama"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
 
@@ -240,14 +245,10 @@ msgstr "Kurulumu tamamla"
 msgid "web services under your control"
 msgstr "kontrolünüzdeki web servisleri"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Ayarlar"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 6d792546a4b13d8f5730b59486725548afd88640..d63bb38a57bda7bdbbc1c173aa7b25a190eb06db 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -55,20 +56,40 @@ msgstr "Dosyalar"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Paylaşılmayan"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
 msgstr "Sil"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "geri al"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "silindi"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
diff --git a/l10n/tr/gallery.po b/l10n/tr/gallery.po
index d13585d1eb8fa7a49e7858bc16d75698406ab44e..b150c44bf8a7251d504a1c9ff9b6607aad4ecbe8 100644
--- a/l10n/tr/gallery.po
+++ b/l10n/tr/gallery.po
@@ -5,75 +5,41 @@
 # Translators:
 #   <ahmet_kaplan@hotmail.com>, 2012.
 # Aranel Surion <aranel@aranelsurion.org>, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
+# Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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: Turkish (http://www.transifex.net/projects/p/owncloud/language/tr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:13+0000\n"
+"Last-Translator: Emre Saraçoğlu <emresaracoglu@live.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:39
 msgid "Pictures"
 msgstr "Resimler"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Galeriyi paylaş"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Hata: "
 
-#: 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 "Ayarlar"
-
-#: 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 "Yeniden Tara "
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Durdur"
+msgstr "İç hata"
 
-#: templates/index.php:18
-msgid "Share"
-msgstr "Paylaş"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Slide Gösterim"
 
 #: templates/view_album.php:19
 msgid "Back"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index b9af026aba5c9f9e2650afbc2edb57f7d818e50b..66a8b77b9c7f420b1b194993a21d5189cada6ae6 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Emre  <emresaracoglu@live.com>, 2012.
 # Necdet Yücel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 09:13+0000\n"
+"Last-Translator: Emre Saraçoğlu <emresaracoglu@live.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +38,7 @@ msgstr "Geçersiz istek"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Eşleşme hata"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -61,7 +62,7 @@ msgstr "__dil_adı__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Güvenlik Uyarisi"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -205,7 +206,7 @@ msgstr "Diğer"
 
 #: templates/users.php:80
 msgid "SubAdmin"
-msgstr ""
+msgstr "Alt Yönetici"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -213,7 +214,7 @@ msgstr "Kota"
 
 #: templates/users.php:112
 msgid "SubAdmin for ..."
-msgstr ""
+msgstr "Alt yönetici için ..."
 
 #: templates/users.php:145
 msgid "Delete"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index e284cb8b0f7f8f5de5b78e46d9094cbe9be59fcf..19ad51b59688928e94d1065a592d9cd17781fc01 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/contacts.po
@@ -8,101 +8,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr ""
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr ""
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "Має бути заповнено щонайменше одне поле."
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr ""
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr ""
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "Помилка при додаванні адресної книги."
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr ""
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr ""
@@ -111,231 +107,185 @@ msgstr ""
 msgid "Error deleting contact property."
 msgstr ""
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr ""
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr ""
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr ""
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -348,91 +298,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/hooks.php:79
-msgid "{name}'s Birthday"
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "День народження"
+
+#: lib/app.php:181
+msgid "Business"
 msgstr ""
 
-#: lib/search.php:22
-msgid "Contact"
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
 msgstr ""
 
-#: templates/index.php:13
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
+msgid "{name}'s Birthday"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Додати контакт"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr ""
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr ""
@@ -441,11 +500,7 @@ msgstr ""
 msgid "New Address Book"
 msgstr "Нова адресна книга"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr ""
@@ -459,185 +514,194 @@ msgid "Edit"
 msgstr ""
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "Видалити контакт"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "День народження"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr ""
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr ""
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
+#: templates/part.contact.php:122
+msgid "Download contact"
 msgstr ""
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "Видалити контакт"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "Розширено"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "Вулиця"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "Місто"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "Поштовий індекс"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "Країна"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "Додати"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "Країна"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -744,7 +808,6 @@ msgid "Submit"
 msgstr ""
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr ""
 
@@ -764,33 +827,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -803,18 +843,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index fe1c962318b536a3185b529cbaa2ead19890d504..d0c31b79d53d01c8de17dd8d0b9587c7acd72f0f 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,10 +9,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,51 +35,59 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Налаштування"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -108,10 +116,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr ""
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -241,14 +245,10 @@ msgstr "Завершити налаштування"
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Налаштування"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Забули пароль?"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index dd7bbef90218697037f7ba12ec4c6070bdea8d81..ef13ab4cc1baf58f845501cc81a9467d23e9affe 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.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-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -55,43 +55,63 @@ msgstr "Файли"
 
 #: js/fileactions.js:95
 msgid "Unshare"
-msgstr ""
+msgstr "Заборонити доступ"
 
 #: js/fileactions.js:97 templates/index.php:56
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "відмінити"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "видалені"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Створення ZIP-файлу, це може зайняти певний час."
 
 #: js/files.js:199
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
 #: js/files.js:199
 msgid "Upload Error"
-msgstr ""
+msgstr "Помилка завантаження"
 
 #: js/files.js:227 js/files.js:318 js/files.js:347
 msgid "Pending"
-msgstr ""
+msgstr "Очікування"
 
 #: js/files.js:332
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Завантаження перервано."
 
 #: js/files.js:456
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Некоректне ім'я, '/' не дозволено."
 
 #: js/files.js:631 templates/index.php:55
 msgid "Size"
@@ -103,19 +123,19 @@ msgstr "Змінено"
 
 #: js/files.js:659
 msgid "folder"
-msgstr ""
+msgstr "тека"
 
 #: js/files.js:661
 msgid "folders"
-msgstr ""
+msgstr "теки"
 
 #: js/files.js:669
 msgid "file"
-msgstr ""
+msgstr "файл"
 
 #: js/files.js:671
 msgid "files"
-msgstr ""
+msgstr "файли"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -127,7 +147,7 @@ msgstr "Максимальний розмір відвантажень"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "макс.можливе:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
@@ -139,7 +159,7 @@ msgstr ""
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 є безліміт"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
@@ -159,7 +179,7 @@ msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "З URL"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -167,7 +187,7 @@ msgstr "Відвантажити"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Перервати завантаження"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -179,7 +199,7 @@ msgstr "Ім'я"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Поділитися"
 
 #: templates/index.php:51
 msgid "Download"
@@ -197,8 +217,8 @@ msgstr "Файли,що ви намагаєтесь відвантажити п
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Файли скануються, зачекайте, будь-ласка."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Поточне сканування"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index fd95f1c13073f90f4587acf133c7e268aebd7cc7..a818ac7d1f4b5d0e2fa0e58b2e7d4a09250bac4a 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dzubchikd@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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 21:26+0000\n"
+"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +20,51 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Допомога"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Особисте"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Налаштування"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Користувачі"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Додатки"
 
 #: app.php:313
 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."
@@ -71,42 +72,42 @@ 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/uk/media.po b/l10n/uk/media.po
index 5df57e85657752153c8935a49dece09ff8b76bf2..aef0c0eada9080ab8ab51d005b96bd0961d664e3 100644
--- a/l10n/uk/media.po
+++ b/l10n/uk/media.po
@@ -3,64 +3,65 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dzubchikd@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: Ukrainian (http://www.transifex.net/projects/p/owncloud/language/uk/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 21:07+0000\n"
+"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: appinfo/app.php:32 templates/player.php:8
+#: appinfo/app.php:45 templates/player.php:8
 msgid "Music"
-msgstr ""
+msgstr "Музика"
 
 #: js/music.js:18
 msgid "Add album to playlist"
-msgstr ""
+msgstr "Додати альбом до плейлиста"
 
 #: templates/music.php:3 templates/player.php:12
 msgid "Play"
-msgstr ""
+msgstr "Грати"
 
 #: templates/music.php:4 templates/music.php:26 templates/player.php:13
 msgid "Pause"
-msgstr ""
+msgstr "Пауза"
 
 #: templates/music.php:5
 msgid "Previous"
-msgstr ""
+msgstr "Попередній"
 
 #: templates/music.php:6 templates/player.php:14
 msgid "Next"
-msgstr ""
+msgstr "Наступний"
 
 #: templates/music.php:7
 msgid "Mute"
-msgstr ""
+msgstr "Звук вкл."
 
 #: templates/music.php:8
 msgid "Unmute"
-msgstr ""
+msgstr "Звук викл."
 
 #: templates/music.php:25
 msgid "Rescan Collection"
-msgstr ""
+msgstr "Повторне сканування колекції"
 
 #: templates/music.php:37
 msgid "Artist"
-msgstr ""
+msgstr "Виконавець"
 
 #: templates/music.php:38
 msgid "Album"
-msgstr ""
+msgstr "Альбом"
 
 #: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Заголовок"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 1dd51bd45e97d1a9aab7930ae46d4ef3617fa54a..134236723a8018e0fe14ed293c8997b58472f879 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dzubchikd@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
-"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 21:39+0000\n"
+"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +28,11 @@ msgstr ""
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID змінено"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr ""
+msgstr "Помилковий запит"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
@@ -39,7 +40,7 @@ msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
-msgstr ""
+msgstr "Мова змінена"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
@@ -75,7 +76,7 @@ msgstr ""
 
 #: templates/apps.php:24
 msgid "Select an App"
-msgstr ""
+msgstr "Вибрати додаток"
 
 #: templates/apps.php:27
 msgid "See application page at apps.owncloud.com"
@@ -83,11 +84,11 @@ msgstr ""
 
 #: templates/apps.php:28
 msgid "-licensed"
-msgstr ""
+msgstr "-ліцензовано"
 
 #: templates/apps.php:28
 msgid "by"
-msgstr ""
+msgstr "по"
 
 #: templates/help.php:8
 msgid "Documentation"
@@ -99,11 +100,11 @@ msgstr ""
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr ""
+msgstr "Запитати"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Проблема при з'єднані з базою допомоги"
 
 #: templates/help.php:23
 msgid "Go there manually."
@@ -115,11 +116,11 @@ msgstr ""
 
 #: templates/personal.php:8
 msgid "You use"
-msgstr ""
+msgstr "Ви використовуєте"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr ""
+msgstr "з доступної"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -131,7 +132,7 @@ msgstr ""
 
 #: templates/personal.php:19
 msgid "Your password got changed"
-msgstr ""
+msgstr "Ваш пароль змінено"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
@@ -139,19 +140,19 @@ msgstr ""
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr ""
+msgstr "Поточний пароль"
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "Новий пароль"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr ""
+msgstr "показати"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr ""
+msgstr "Змінити пароль"
 
 #: templates/personal.php:30
 msgid "Email"
@@ -167,7 +168,7 @@ msgstr ""
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
-msgstr ""
+msgstr "Мова"
 
 #: templates/personal.php:44
 msgid "Help translate"
@@ -179,19 +180,19 @@ msgstr ""
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
-msgstr ""
+msgstr "Ім'я"
 
 #: templates/users.php:23 templates/users.php:77
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/users.php:32
 msgid "Create"
-msgstr ""
+msgstr "Створити"
 
 #: templates/users.php:35
 msgid "Default Quota"
@@ -215,4 +216,4 @@ msgstr ""
 
 #: templates/users.php:145
 msgid "Delete"
-msgstr ""
+msgstr "Видалити"
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 41383998b6b852ff152777ee79a060ebec7722e1..5451d950699c0937782131884d666aea22baa615 100644
--- a/l10n/vi/contacts.po
+++ b/l10n/vi/contacts.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-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:29+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -82,20 +82,20 @@ msgstr "Missing ID"
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Lỗi đọc liên lạc hình ảnh."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "Các hình ảnh tải không hợp lệ."
 
@@ -123,31 +123,31 @@ msgstr "Tập tin không tồn tại"
 msgid "Error loading image."
 msgstr "Lỗi khi tải hình ảnh."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
@@ -179,110 +179,110 @@ msgstr ""
 msgid "Error uploading contacts to storage."
 msgstr "Lỗi tải lên danh sách địa chỉ để lưu trữ."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Không có lỗi, các tập tin tải lên thành công"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Danh sách"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
@@ -298,129 +298,129 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr ""
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Điện thoại bàn"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Công việc"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Nhà"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Di động"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "số trang"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Ngày sinh nhật"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr ""
 
@@ -428,63 +428,67 @@ msgstr ""
 msgid "{name}'s Birthday"
 msgstr ""
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Thêm liên lạc"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Sổ địa chỉ"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr ""
 
@@ -851,22 +855,22 @@ msgstr ""
 msgid "Enter description"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index b00d5071671228a47e9fb4b4da64ceb4988692b2..60bed8f0dcf81b245996ddd94c95e731462fdc07 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.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-26 08:03+0200\n"
-"PO-Revision-Date: 2012-07-25 19:28+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -34,51 +34,59 @@ msgstr "Danh mục này đã được tạo :"
 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:519
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Cài đặt"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:519
+#: js/js.js:573
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:520
+#: js/js.js:574
 msgid "December"
 msgstr "Tháng 12"
 
@@ -240,10 +248,6 @@ msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: templates/layout.user.php:64 templates/layout.user.php:65
-msgid "Settings"
-msgstr "Cài đặt"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 65038a686eb72e9953c9b575373a566eb7602256..fa964a6646d790522dcfbc8e9f5fafc7ee665add 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 7d48fb931a0ea185caf376278b9b9deeaa3646d1..577dc470d47642ddf694d3473f3e12a9bbe6d8b4 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.po
@@ -3,107 +3,104 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 2012.
 #   <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-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+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-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"
+"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"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "(取消)激活地址簿错误。"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "添加联系人时出错。"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr "元素名称未设置"
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr "没有设置 id。"
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "无法添加空属性。"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "至少需要填写一项地址。"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr "试图添加重复属性: "
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "添加联系人属性错误。"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr "设置校验值错误。"
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr "未选中要删除的分类。"
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr "找不到地址簿。"
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "找不到联系人。"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "缺少 ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr "无法解析如下ID的 VCard:“"
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr "无法无姓名的地址簿。"
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "添加地址簿错误。"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "激活地址簿错误。"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "未提交联系人 ID。"
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "读取联系人照片错误。"
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "保存临时文件错误。"
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "装入的照片不正确。"
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr "没有设置 id。"
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "vCard 的信息不正确。请重新加载页面。"
@@ -112,328 +109,391 @@ msgstr "vCard 的信息不正确。请重新加载页面。"
 msgid "Error deleting contact property."
 msgstr "删除联系人属性错误。"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr "缺少联系人 ID。"
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr "缺少联系人 ID。"
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr "未提供照片路径。"
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr "文件不存在:"
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr "加载图片错误。"
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
-msgstr ""
+msgstr "获取联系人目标时出错。"
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "获取照片属性时出错。"
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
-msgstr ""
+msgstr "保存联系人时出错。"
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
-msgstr ""
+msgstr "缩放图像时出错"
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
-msgstr ""
+msgstr "裁切图像时出错"
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "创建临时图像时出错"
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
-msgstr ""
+msgstr "查找图像时出错: "
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr "未设置校验值。"
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
-msgstr ""
+msgstr "vCard 信息不正确。请刷新页面: "
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
-msgstr ""
+msgstr "有一些信息无法被处理。"
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "更新联系人属性错误。"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
-msgstr ""
+msgstr "无法使用一个空名称更新地址簿"
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "更新地址簿错误"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
-msgstr ""
+msgstr "上传联系人到存储空间时出错"
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "文件上传成功,没有错误发生"
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制"
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "无法保存临时图像: "
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "无法加载临时图像: "
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "没有文件被上传。未知错误"
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "联系人"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "抱歉,这个功能暂时还没有被实现"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
-msgstr ""
+msgstr "未实现"
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
-msgstr ""
-
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+msgstr "无法获取一个合法的地址。"
+
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "联系人"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "这个属性必须是非空的"
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "无法序列化元素"
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
-msgstr ""
+msgstr "编辑名称"
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
-msgstr ""
+msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
-
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
+msgstr "您试图上传的文件超出了该服务器的最大文件限制"
 
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
-msgstr ""
-
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
+msgstr "选择类型"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "结果: "
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr " 已导入, "
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr " 失败。"
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "未找到地址簿。"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "消息"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "传呼机"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "互联网"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name} 的生日"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "联系人"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加联系人"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr "导入"
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "地址簿"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr "关闭"
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "配置地址簿"
@@ -442,11 +502,7 @@ msgstr "配置地址簿"
 msgid "New Address Book"
 msgstr "新建地址簿"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "从 VCF 导入"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav 链接"
@@ -460,217 +516,226 @@ msgid "Edit"
 msgstr "编辑"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "删除"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "下载联系人"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr "拖拽图片进行上传"
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "删除联系人"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr "删除当前照片"
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
-msgstr "拖拽图片进行上传"
+msgid "Edit current photo"
+msgstr "编辑当前照片"
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr "上传新照片"
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
+msgstr "从 ownCloud 选择照片"
+
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
-msgstr ""
+msgstr "自定义格式,简称,全名,姓在前,姓在前并用逗号分割"
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "编辑名称详情"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "昵称"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "输入昵称"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "生日"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "分组"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "用逗号隔开分组"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "编辑分组"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "偏好"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "请指定合法的电子邮件地址"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "输入电子邮件地址"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "发送邮件到地址"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "删除电子邮件地址"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "输入电话号码"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "删除电话号码"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr "在地图上显示"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "编辑地址细节。"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "添加注释。"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "添加字段"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "联系人图片"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "电话"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "注释"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr "删除当前照片"
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr "编辑当前照片"
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr "上传新照片"
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "下载联系人"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr "从 ownCloud 选择照片"
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "删除联系人"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "临时图像文件已从缓存中删除"
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr "编辑地址"
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "类型"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "邮箱"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "扩展"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "街道"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "城市"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "地区"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "邮编"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
 msgid "Country"
 msgstr "国家"
 
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr "编辑分类"
-
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "添加"
-
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
 msgstr "地址簿"
 
 #: templates/part.edit_name_dialog.php:23
 msgid "Hon. prefixes"
-msgstr ""
+msgstr "名誉字首"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "小姐"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "女士"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "夫人"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "博士"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -678,7 +743,7 @@ msgstr "名"
 
 #: templates/part.edit_name_dialog.php:37
 msgid "Additional names"
-msgstr ""
+msgstr "其他名称"
 
 #: templates/part.edit_name_dialog.php:39
 msgid "Family name"
@@ -686,39 +751,39 @@ msgstr "姓"
 
 #: templates/part.edit_name_dialog.php:41
 msgid "Hon. suffixes"
-msgstr ""
+msgstr "名誉后缀"
 
 #: templates/part.edit_name_dialog.php:45
 msgid "J.D."
-msgstr ""
+msgstr "法律博士"
 
 #: templates/part.edit_name_dialog.php:46
 msgid "M.D."
-msgstr ""
+msgstr "医学博士"
 
 #: templates/part.edit_name_dialog.php:47
 msgid "D.O."
-msgstr ""
+msgstr "骨科医学博士"
 
 #: templates/part.edit_name_dialog.php:48
 msgid "D.C."
-msgstr ""
+msgstr "教育学博士"
 
 #: templates/part.edit_name_dialog.php:49
 msgid "Ph.D."
-msgstr ""
+msgstr "哲学博士"
 
 #: templates/part.edit_name_dialog.php:50
 msgid "Esq."
-msgstr ""
+msgstr "先生"
 
 #: templates/part.edit_name_dialog.php:51
 msgid "Jr."
-msgstr ""
+msgstr "小"
 
 #: templates/part.edit_name_dialog.php:52
 msgid "Sn."
-msgstr ""
+msgstr "老"
 
 #: templates/part.editaddressbook.php:9
 msgid "New Addressbook"
@@ -745,7 +810,6 @@ msgid "Submit"
 msgstr "提交"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -765,36 +829,13 @@ msgstr "创建新地址簿"
 msgid "Name of new addressbook"
 msgstr "新地址簿名称"
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr "导入"
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr "导入联系人"
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
-msgstr ""
+msgstr "您的地址簿中没有联系人。"
 
 #: templates/part.no_contacts.php:4
 msgid "Add contact"
@@ -804,18 +845,34 @@ msgstr "添加联系人"
 msgid "Configure addressbooks"
 msgstr "配置地址簿"
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "CardDAV 同步地址"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "更多信息"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "首选地址 (Kontact 等)"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 54f452ded22defcdc5748435141f8b0d3eb02d9b..f9babe102eb96ed97858ac0a6e668b4cb240cd0a 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Phoenix Nemo <>, 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-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+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-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,83 +35,87 @@ msgstr "此分类已存在: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
-msgid "January"
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "设置"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
+msgid "January"
+msgstr "一月"
+
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "二月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "三月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "四月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "五月"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "六月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "七月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "八月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "九月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "十月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "否"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "好"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "没有选择要删除的类别"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "重置 Owncloud 密码"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "重置 ownCloud 密码"
 
@@ -240,14 +245,10 @@ msgstr "安装完成"
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "注销"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "设置"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "忘记密码?"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 1433f41f2679eb8ddd394be82908ff44972431b7..2c6753172238da48e6b989fd62269bcdf3e28288 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -60,14 +60,34 @@ msgstr ""
 msgid "Delete"
 msgstr "删除"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成 ZIP 文件,可能需要一些时间"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index 9d49e670c5985f3932704b9b67ed9b35c6560520..db0b2a0c0fae04cefaec0e709f782da1d119dece 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,101 +9,97 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:19 ajax/updateaddressbook.php:32
+#: ajax/activation.php:24 ajax/updateaddressbook.php:29
 msgid "Error (de)activating addressbook."
 msgstr "在啟用或關閉電話簿時發生錯誤"
 
-#: ajax/addcontact.php:59
+#: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "添加通訊錄發生錯誤"
 
-#: ajax/addproperty.php:40
+#: ajax/addproperty.php:39 ajax/saveproperty.php:34
+msgid "element name is not set."
+msgstr ""
+
+#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+msgid "id is not set."
+msgstr ""
+
+#: ajax/addproperty.php:46
+msgid "Could not parse contact: "
+msgstr ""
+
+#: ajax/addproperty.php:56
 msgid "Cannot add empty property."
 msgstr "不可添加空白內容"
 
-#: ajax/addproperty.php:52
+#: ajax/addproperty.php:67
 msgid "At least one of the address fields has to be filled out."
 msgstr "至少必須填寫一欄地址"
 
-#: ajax/addproperty.php:62
+#: ajax/addproperty.php:76
 msgid "Trying to add duplicate property: "
 msgstr ""
 
-#: ajax/addproperty.php:120
-msgid "Error adding contact property."
-msgstr "添加通訊錄內容中發生錯誤"
+#: ajax/addproperty.php:144
+msgid "Error adding contact property: "
+msgstr ""
 
-#: ajax/categories/categoriesfor.php:15
+#: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
 
-#: ajax/categories/categoriesfor.php:27
+#: ajax/categories/categoriesfor.php:34
 msgid "Error setting checksum."
 msgstr ""
 
-#: ajax/categories/delete.php:29
+#: ajax/categories/delete.php:19
 msgid "No categories selected for deletion."
 msgstr ""
 
-#: ajax/categories/delete.php:36 ajax/categories/rescan.php:28
+#: ajax/categories/delete.php:26
 msgid "No address books found."
 msgstr ""
 
-#: ajax/categories/delete.php:44 ajax/categories/rescan.php:36
+#: ajax/categories/delete.php:34
 msgid "No contacts found."
 msgstr "沒有找到聯絡人"
 
-#: ajax/contactdetails.php:37
+#: ajax/contactdetails.php:31
 msgid "Missing ID"
 msgstr "遺失ID"
 
-#: ajax/contactdetails.php:41
+#: ajax/contactdetails.php:36
 msgid "Error parsing VCard for ID: \""
 msgstr ""
 
-#: ajax/createaddressbook.php:18
-msgid "Cannot add addressbook with an empty name."
-msgstr ""
-
-#: ajax/createaddressbook.php:24
-msgid "Error adding addressbook."
-msgstr "添加電話簿中發生錯誤"
-
-#: ajax/createaddressbook.php:30
-msgid "Error activating addressbook."
-msgstr "啟用電話簿中發生錯誤"
-
-#: ajax/currentphoto.php:34 ajax/oc_photo.php:37 ajax/uploadphoto.php:41
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr ""
 
-#: ajax/currentphoto.php:40
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr ""
 
-#: ajax/currentphoto.php:52
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr ""
 
-#: ajax/currentphoto.php:55
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr ""
 
-#: ajax/deletecard.php:37 ajax/saveproperty.php:58
-msgid "id is not set."
-msgstr ""
-
 #: ajax/deleteproperty.php:36
 msgid "Information about vCard is incorrect. Please reload the page."
 msgstr "有關 vCard 的資訊不正確,請重新載入此頁。"
@@ -112,231 +108,185 @@ msgstr "有關 vCard 的資訊不正確,請重新載入此頁。"
 msgid "Error deleting contact property."
 msgstr "刪除通訊錄內容中發生錯誤"
 
-#: ajax/editname.php:37
+#: ajax/editname.php:31
 msgid "Contact ID is missing."
 msgstr ""
 
-#: ajax/loadphoto.php:44
-msgid "Missing contact id."
-msgstr ""
-
-#: ajax/oc_photo.php:41
+#: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
 msgstr ""
 
-#: ajax/oc_photo.php:48
+#: ajax/oc_photo.php:39
 msgid "File doesn't exist:"
 msgstr ""
 
-#: ajax/oc_photo.php:54 ajax/oc_photo.php:57
+#: ajax/oc_photo.php:44 ajax/oc_photo.php:47
 msgid "Error loading image."
 msgstr ""
 
-#: ajax/savecrop.php:68
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr ""
 
-#: ajax/savecrop.php:75
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr ""
 
-#: ajax/savecrop.php:88
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr ""
 
-#: ajax/savecrop.php:98
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr ""
 
-#: ajax/savecrop.php:101
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr ""
 
-#: ajax/savecrop.php:104
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr ""
 
-#: ajax/savecrop.php:107
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr ""
 
-#: ajax/saveproperty.php:55
-msgid "element name is not set."
-msgstr ""
-
-#: ajax/saveproperty.php:61
+#: ajax/saveproperty.php:40
 msgid "checksum is not set."
 msgstr ""
 
-#: ajax/saveproperty.php:78
+#: ajax/saveproperty.php:59
 msgid "Information about vCard is incorrect. Please reload the page: "
 msgstr ""
 
-#: ajax/saveproperty.php:83
+#: ajax/saveproperty.php:64
 msgid "Something went FUBAR. "
 msgstr ""
 
-#: ajax/saveproperty.php:150
+#: ajax/saveproperty.php:133
 msgid "Error updating contact property."
 msgstr "更新通訊錄內容中發生錯誤"
 
-#: ajax/updateaddressbook.php:20
+#: ajax/updateaddressbook.php:21
 msgid "Cannot update addressbook with an empty name."
 msgstr ""
 
-#: ajax/updateaddressbook.php:26
+#: ajax/updateaddressbook.php:25
 msgid "Error updating addressbook."
 msgstr "電話簿更新中發生錯誤"
 
-#: ajax/uploadimport.php:46 ajax/uploadimport.php:76
+#: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
 
-#: ajax/uploadimport.php:59 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/uploadimport.php:60 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "沒有已上傳的檔案"
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:102
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:105
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr ""
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:17 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:24
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:29
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr ""
 
-#: js/contacts.js:29 js/contacts.js:334 js/contacts.js:341 js/contacts.js:355
-#: js/contacts.js:393 js/contacts.js:399 js/contacts.js:565 js/contacts.js:605
-#: js/contacts.js:631 js/contacts.js:668 js/contacts.js:747 js/contacts.js:753
-#: js/contacts.js:765 js/contacts.js:799 js/contacts.js:1056
-#: js/contacts.js:1064 js/contacts.js:1073 js/contacts.js:1130
-#: js/contacts.js:1146 js/contacts.js:1161 js/contacts.js:1173
-#: js/contacts.js:1196 js/contacts.js:1449 js/contacts.js:1457
-#: js/contacts.js:1483 js/contacts.js:1494 js/contacts.js:1509
-#: js/contacts.js:1526 js/contacts.js:1596 js/contacts.js:1644
-#: js/contacts.js:1654 js/contacts.js:1657
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 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:1570
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Are you sure you want to delete this contact?"
+#: js/contacts.js:400 lib/search.php:15
+msgid "Contact"
+msgstr "通訊錄"
+
+#: js/contacts.js:400
+msgid "New"
 msgstr ""
 
-#: js/contacts.js:364
-msgid "Warning"
+#: js/contacts.js:400
+msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:605
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:631
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:747 js/contacts.js:765
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:781
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1056
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1064 js/contacts.js:1449 js/contacts.js:1634
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: js/contacts.js:1119
-msgid "Select photo"
-msgstr ""
-
-#: js/contacts.js:1257 js/contacts.js:1290
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr ""
 
-#: js/contacts.js:1305 templates/part.importaddressbook.php:25
-msgid "Drop a VCF file to import contacts."
-msgstr ""
-
-#: js/contacts.js:1475
-msgid "Import done. Success/Failure: "
-msgstr ""
-
-#: js/contacts.js:1476
-msgid "OK"
-msgstr ""
-
-#: js/contacts.js:1494
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: js/contacts.js:1634
-msgid "Upload too large"
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Only image files can be used as profile picture."
-msgstr ""
-
-#: js/contacts.js:1638
-msgid "Wrong file type"
-msgstr ""
-
-#: js/contacts.js:1644
-msgid ""
-"Your browser doesn't support AJAX upload. Please click on the profile "
-"picture to select a photo to upload."
-msgstr ""
-
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -349,91 +299,200 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:30
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "找不到通訊錄"
 
-#: lib/app.php:34
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:45
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:101 templates/part.contact.php:109
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:102
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:103 templates/part.contact.php:108
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:104 templates/part.contact.php:33 templates/part.contact.php:34
-#: templates/part.contact.php:104
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
+#: templates/part.contact.php:111
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:116 lib/app.php:123 lib/app.php:133
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:117 lib/app.php:121 lib/app.php:134
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:122
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:124
+#: lib/app.php:132
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:125
+#: lib/app.php:133
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:126
+#: lib/app.php:134
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:127
+#: lib/app.php:135
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:128
+#: lib/app.php:136
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:129
+#: lib/app.php:137
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:135
+#: lib/app.php:143
 msgid "Internet"
 msgstr "網際網路"
 
-#: lib/hooks.php:79
+#: lib/app.php:180 templates/part.contact.php:44
+#: templates/part.contact.php:113
+msgid "Birthday"
+msgstr "生日"
+
+#: lib/app.php:181
+msgid "Business"
+msgstr ""
+
+#: lib/app.php:182
+msgid "Call"
+msgstr ""
+
+#: lib/app.php:183
+msgid "Clients"
+msgstr ""
+
+#: lib/app.php:184
+msgid "Deliverer"
+msgstr ""
+
+#: lib/app.php:185
+msgid "Holidays"
+msgstr ""
+
+#: lib/app.php:186
+msgid "Ideas"
+msgstr ""
+
+#: lib/app.php:187
+msgid "Journey"
+msgstr ""
+
+#: lib/app.php:188
+msgid "Jubilee"
+msgstr ""
+
+#: lib/app.php:189
+msgid "Meeting"
+msgstr ""
+
+#: lib/app.php:190
+msgid "Other"
+msgstr ""
+
+#: lib/app.php:191
+msgid "Personal"
+msgstr ""
+
+#: lib/app.php:192
+msgid "Projects"
+msgstr ""
+
+#: lib/app.php:193
+msgid "Questions"
+msgstr ""
+
+#: lib/hooks.php:102
 msgid "{name}'s Birthday"
 msgstr "{name}的生日"
 
-#: lib/search.php:22
-msgid "Contact"
-msgstr "通訊錄"
-
-#: templates/index.php:13
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "添加通訊錄"
 
-#: templates/index.php:14
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
+msgid "Import"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "電話簿"
 
+#: templates/index.php:38 templates/part.import.php:24
+msgid "Close"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Navigation"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Next contact in list"
+msgstr ""
+
+#: templates/index.php:47
+msgid "Previous contact in list"
+msgstr ""
+
+#: templates/index.php:49
+msgid "Expand/collapse current addressbook"
+msgstr ""
+
+#: templates/index.php:51
+msgid "Next/previous addressbook"
+msgstr ""
+
+#: templates/index.php:55
+msgid "Actions"
+msgstr ""
+
+#: templates/index.php:58
+msgid "Refresh contacts list"
+msgstr ""
+
+#: templates/index.php:60
+msgid "Add new contact"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Add new addressbook"
+msgstr ""
+
+#: templates/index.php:64
+msgid "Delete current contact"
+msgstr ""
+
 #: templates/part.chooseaddressbook.php:1
 msgid "Configure Address Books"
 msgstr "設定通訊錄"
@@ -442,11 +501,7 @@ msgstr "設定通訊錄"
 msgid "New Address Book"
 msgstr "新電話簿"
 
-#: templates/part.chooseaddressbook.php:17
-msgid "Import from VCF"
-msgstr "從VCF匯入"
-
-#: templates/part.chooseaddressbook.php:22
+#: templates/part.chooseaddressbook.php:21
 #: templates/part.chooseaddressbook.rowfields.php:8
 msgid "CardDav Link"
 msgstr "CardDav 聯結"
@@ -460,185 +515,194 @@ msgid "Edit"
 msgstr "編輯"
 
 #: templates/part.chooseaddressbook.rowfields.php:17
-#: templates/part.contact.php:34 templates/part.contact.php:36
-#: templates/part.contact.php:38 templates/part.contact.php:42
+#: 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
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/part.contact.php:12
-msgid "Download contact"
-msgstr "下載通訊錄"
+#: templates/part.contact.php:16
+msgid "Drop photo to upload"
+msgstr ""
 
-#: templates/part.contact.php:13
-msgid "Delete contact"
-msgstr "刪除通訊錄"
+#: templates/part.contact.php:18
+msgid "Delete current photo"
+msgstr ""
 
 #: templates/part.contact.php:19
-msgid "Drop photo to upload"
+msgid "Edit current photo"
+msgstr ""
+
+#: templates/part.contact.php:20
+msgid "Upload new photo"
+msgstr ""
+
+#: templates/part.contact.php:21
+msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:29
+#: templates/part.contact.php:34
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:30
+#: templates/part.contact.php:35
 msgid "Edit name details"
 msgstr "編輯姓名詳細資訊"
 
-#: templates/part.contact.php:35 templates/part.contact.php:105
+#: templates/part.contact.php:40 templates/part.contact.php:112
 msgid "Nickname"
 msgstr "綽號"
 
-#: templates/part.contact.php:36
+#: templates/part.contact.php:41
 msgid "Enter nickname"
 msgstr "輸入綽號"
 
-#: templates/part.contact.php:37 templates/part.contact.php:106
-msgid "Birthday"
-msgstr "生日"
+#: templates/part.contact.php:42 templates/part.contact.php:118
+msgid "Web site"
+msgstr ""
+
+#: templates/part.contact.php:43
+msgid "http://www.somesite.com"
+msgstr ""
 
-#: templates/part.contact.php:38
+#: templates/part.contact.php:43
+msgid "Go to web site"
+msgstr ""
+
+#: templates/part.contact.php:45
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:39 templates/part.contact.php:111
+#: templates/part.contact.php:46 templates/part.contact.php:119
 msgid "Groups"
 msgstr "群組"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:48
 msgid "Separate groups with commas"
 msgstr "用逗號分隔群組"
 
-#: templates/part.contact.php:42
+#: templates/part.contact.php:49
 msgid "Edit groups"
 msgstr "編輯群組"
 
-#: templates/part.contact.php:55 templates/part.contact.php:69
+#: templates/part.contact.php:62 templates/part.contact.php:76
 msgid "Preferred"
 msgstr "首選"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Please specify a valid email address."
 msgstr "註填入合法的電子郵件住址"
 
-#: templates/part.contact.php:56
+#: templates/part.contact.php:63
 msgid "Enter email address"
 msgstr "輸入電子郵件地址"
 
-#: templates/part.contact.php:60
+#: templates/part.contact.php:67
 msgid "Mail to address"
 msgstr "寄送住址"
 
-#: templates/part.contact.php:61
+#: templates/part.contact.php:68
 msgid "Delete email address"
 msgstr "刪除電子郵件住址"
 
-#: templates/part.contact.php:70
+#: templates/part.contact.php:77
 msgid "Enter phone number"
 msgstr "輸入電話號碼"
 
-#: templates/part.contact.php:74
+#: templates/part.contact.php:81
 msgid "Delete phone number"
 msgstr "刪除電話號碼"
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:84
+#: templates/part.contact.php:91
 msgid "Edit address details"
 msgstr "電子郵件住址詳細資訊"
 
-#: templates/part.contact.php:95
+#: templates/part.contact.php:102
 msgid "Add notes here."
 msgstr "在這裡新增註解"
 
-#: templates/part.contact.php:101
+#: templates/part.contact.php:109
 msgid "Add field"
 msgstr "新增欄位"
 
-#: templates/part.contact.php:103
-msgid "Profile picture"
-msgstr "個人資料照片"
-
-#: templates/part.contact.php:107
+#: templates/part.contact.php:114
 msgid "Phone"
 msgstr "電話"
 
-#: templates/part.contact.php:110
+#: templates/part.contact.php:117
 msgid "Note"
 msgstr "註解"
 
-#: templates/part.contactphoto.php:8
-msgid "Delete current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:9
-msgid "Edit current photo"
-msgstr ""
-
-#: templates/part.contactphoto.php:10
-msgid "Upload new photo"
-msgstr ""
+#: templates/part.contact.php:122
+msgid "Download contact"
+msgstr "下載通訊錄"
 
-#: templates/part.contactphoto.php:11
-msgid "Select photo from ownCloud"
-msgstr ""
+#: templates/part.contact.php:123
+msgid "Delete contact"
+msgstr "刪除通訊錄"
 
-#: templates/part.cropphoto.php:64
+#: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:9
+#: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
 msgstr ""
 
-#: templates/part.edit_address_dialog.php:14
+#: templates/part.edit_address_dialog.php:10
 msgid "Type"
 msgstr "類型"
 
-#: templates/part.edit_address_dialog.php:22
-#: templates/part.edit_address_dialog.php:25
+#: templates/part.edit_address_dialog.php:18
+#: templates/part.edit_address_dialog.php:21
 msgid "PO Box"
 msgstr "通訊地址"
 
-#: templates/part.edit_address_dialog.php:29
-#: templates/part.edit_address_dialog.php:32
+#: templates/part.edit_address_dialog.php:24
+msgid "Street address"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:27
+msgid "Street and number"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:30
 msgid "Extended"
 msgstr "分機"
 
-#: templates/part.edit_address_dialog.php:35
-#: templates/part.edit_address_dialog.php:38
-msgid "Street"
-msgstr "街道"
+#: templates/part.edit_address_dialog.php:33
+msgid "Apartment number etc."
+msgstr ""
 
-#: templates/part.edit_address_dialog.php:41
-#: templates/part.edit_address_dialog.php:44
+#: templates/part.edit_address_dialog.php:36
+#: templates/part.edit_address_dialog.php:39
 msgid "City"
 msgstr "城市"
 
-#: templates/part.edit_address_dialog.php:47
-#: templates/part.edit_address_dialog.php:50
+#: templates/part.edit_address_dialog.php:42
 msgid "Region"
 msgstr "地區"
 
-#: templates/part.edit_address_dialog.php:53
-#: templates/part.edit_address_dialog.php:56
+#: templates/part.edit_address_dialog.php:45
+msgid "E.g. state or province"
+msgstr ""
+
+#: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
 msgstr "郵遞區號"
 
-#: templates/part.edit_address_dialog.php:59
-#: templates/part.edit_address_dialog.php:62
-msgid "Country"
-msgstr "國家"
-
-#: templates/part.edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/part.edit_address_dialog.php:51
+msgid "Postal code"
 msgstr ""
 
-#: templates/part.edit_categories_dialog.php:14
-msgid "Add"
-msgstr "添加"
+#: templates/part.edit_address_dialog.php:54
+#: templates/part.edit_address_dialog.php:57
+msgid "Country"
+msgstr "國家"
 
 #: templates/part.edit_name_dialog.php:16
 msgid "Addressbook"
@@ -745,7 +809,6 @@ msgid "Submit"
 msgstr "提出"
 
 #: templates/part.editaddressbook.php:30
-#: templates/part.importaddressbook.php:34
 msgid "Cancel"
 msgstr "取消"
 
@@ -765,33 +828,10 @@ msgstr ""
 msgid "Name of new addressbook"
 msgstr ""
 
-#: templates/part.import.php:17
-msgid "Import"
-msgstr ""
-
 #: templates/part.import.php:20
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.import.php:24
-msgid "Close"
-msgstr ""
-
-#: templates/part.importaddressbook.php:12
-msgid ""
-"Currently this import function doesn't work while encryption is enabled.<br "
-"/>Please upload your VCF file with the file manager and click on it to "
-"import."
-msgstr ""
-
-#: templates/part.importaddressbook.php:16
-msgid "Select address book to import to:"
-msgstr ""
-
-#: templates/part.importaddressbook.php:26
-msgid "Select from HD"
-msgstr ""
-
 #: templates/part.no_contacts.php:2
 msgid "You have no contacts in your addressbook."
 msgstr ""
@@ -804,18 +844,34 @@ msgstr ""
 msgid "Configure addressbooks"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/part.selectaddressbook.php:1
+msgid "Select Address Books"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:20
+msgid "Enter name"
+msgstr ""
+
+#: templates/part.selectaddressbook.php:22
+msgid "Enter description"
+msgstr ""
+
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr ""
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr ""
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr ""
+
+#: templates/settings.php:9
+msgid "Read only vCard directory link(s)"
+msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 5f3860d447fc4d684a25b8f35d58c7606c04dc04..9cc98c4b811d60b8d966436be584a23b87440d5d 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,10 +8,10 @@ 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:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/owncloud/language/zh_TW/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,51 +34,59 @@ msgstr "此分類已經存在:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "設定"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
+msgstr ""
+
+#: js/js.js:573
 msgid "January"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
 msgstr ""
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
 msgstr ""
 
@@ -107,10 +115,6 @@ msgid "Error"
 msgstr ""
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "私有雲重設密碼"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
 
@@ -240,14 +244,10 @@ msgstr "完成設定"
 msgid "web services under your control"
 msgstr "網路服務已在你控制"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "登出"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "設定"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "忘記密碼?"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index f8687582760819583c9ddcc633fd661f827051c3..8c8f682614053cd73b6c569145b52722523c3095 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -61,14 +61,34 @@ msgstr ""
 msgid "Delete"
 msgstr "刪除"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "with"
 msgstr ""
 
-#: js/filelist.js:186
+#: js/filelist.js:195 js/filelist.js:256
 msgid "undo"
 msgstr ""
 
+#: js/filelist.js:256
+msgid "deleted"
+msgstr ""
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
new file mode 100644
index 0000000000000000000000000000000000000000..174fe0720fde7ec3d1094388366b52699e81f008
--- /dev/null
+++ b/lib/l10n/es.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ayuda",
+"Personal" => "Personal",
+"Settings" => "Ajustes",
+"Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Administración",
+"ZIP download is turned off." => "La descarga en ZIP está desactivada.",
+"Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
+"Back to Files" => "Volver a Archivos",
+"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"Application is not enabled" => "La aplicación no está habilitada",
+"Authentication error" => "Error de autenticación",
+"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
+"seconds ago" => "hace segundos",
+"1 minute ago" => "hace 1 minuto",
+"%d minutes ago" => "hace %d minutos",
+"today" => "hoy",
+"yesterday" => "ayer",
+"%d days ago" => "hace %d días",
+"last month" => "este mes",
+"months ago" => "hace meses",
+"last year" => "este año",
+"years ago" => "hace años"
+);
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
new file mode 100644
index 0000000000000000000000000000000000000000..d8da90a3cbfa6cd216208bd0b7aacd5a92afa832
--- /dev/null
+++ b/lib/l10n/et_EE.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Abiinfo",
+"Personal" => "Isiklik",
+"Settings" => "Seaded",
+"Users" => "Kasutajad",
+"Apps" => "Rakendused",
+"Admin" => "Admin",
+"ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.",
+"Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
+"Back to Files" => "Tagasi failide juurde",
+"Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
+"Application is not enabled" => "Rakendus pole sisse lülitatud",
+"Authentication error" => "Autentimise viga",
+"Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
+"seconds ago" => "sekundit tagasi",
+"1 minute ago" => "1 minut tagasi",
+"%d minutes ago" => "%d minutit tagasi",
+"today" => "täna",
+"yesterday" => "eile",
+"%d days ago" => "%d päeva tagasi",
+"last month" => "eelmisel kuul",
+"months ago" => "kuud tagasi",
+"last year" => "eelmisel aastal",
+"years ago" => "aastat tagasi"
+);
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
new file mode 100644
index 0000000000000000000000000000000000000000..c674b79b9591cdc4da2837f21ea9e0c741439151
--- /dev/null
+++ b/lib/l10n/fr.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Aide",
+"Personal" => "Personnel",
+"Settings" => "Paramètres",
+"Users" => "Utilisateurs",
+"Apps" => "Applications",
+"Admin" => "Administration",
+"ZIP download is turned off." => "Téléchargement ZIP désactivé.",
+"Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
+"Back to Files" => "Retour aux Fichiers",
+"Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.",
+"Application is not enabled" => "L'application n'est pas activée",
+"Authentication error" => "Erreur d'authentification",
+"Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
+"seconds ago" => "à l'instant",
+"1 minute ago" => "il y a 1 minute",
+"%d minutes ago" => "il y a %d minutes",
+"today" => "aujourd'hui",
+"yesterday" => "hier",
+"%d days ago" => "il y a %d jours",
+"last month" => "le mois dernier",
+"months ago" => "il y a plusieurs mois",
+"last year" => "l'année dernière",
+"years ago" => "il y a plusieurs années"
+);
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
new file mode 100644
index 0000000000000000000000000000000000000000..2c88818dc6c385ce6f8b7fb03206512a9c506bc5
--- /dev/null
+++ b/lib/l10n/it.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Aiuto",
+"Personal" => "Personale",
+"Settings" => "Impostazioni",
+"Users" => "Utenti",
+"Apps" => "Applicazioni",
+"Admin" => "Admin",
+"ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.",
+"Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
+"Back to Files" => "Torna ai file",
+"Selected files too large to generate zip file." => "I  file selezionati sono troppo grandi per generare un file zip.",
+"Application is not enabled" => "L'applicazione  non è abilitata",
+"Authentication error" => "Errore di autenticazione",
+"Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
+"seconds ago" => "secondi fa",
+"1 minute ago" => "1 minuto fa",
+"%d minutes ago" => "%d minuti fa",
+"today" => "oggi",
+"yesterday" => "ieri",
+"%d days ago" => "%d giorni fa",
+"last month" => "il mese scorso",
+"months ago" => "mesi fa",
+"last year" => "l'anno scorso",
+"years ago" => "anni fa"
+);
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
new file mode 100644
index 0000000000000000000000000000000000000000..18f6a4a623dc603562ef2e9e36e3fe7f1193b76b
--- /dev/null
+++ b/lib/l10n/uk.php
@@ -0,0 +1,24 @@
+<?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" => "Помилка автентифікації",
+"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/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 6e0c6e2fee4c9b3f4eb7862b074c9f8ea67f504d..4464f7596d34bc8849d1b4948ba0755d8d8d0dc3 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,27 +1,40 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Е-пощата е записана",
+"Invalid email" => "Неправилна е-поща",
 "OpenID Changed" => "OpenID е сменено",
 "Invalid request" => "Невалидна заявка",
 "Language changed" => "Езика е сменен",
+"Disable" => "Изключване",
+"Enable" => "Включване",
+"Saving..." => "Записване...",
 "Select an App" => "Изберете програма",
 "-licensed" => "-лицензирано",
 "by" => "от",
+"Documentation" => "Документация",
 "Ask a question" => "Задайте въпрос",
 "Problems connecting to help database." => "Проблеми при свързване с помощната база",
 "Go there manually." => "Отидете ръчно.",
 "Answer" => "Отговор",
 "You use" => "Вие ползвате",
 "of the available" => "от наличните",
+"Download" => "Изтегляне",
 "Your password got changed" => "Вашата парола е сменена",
 "Unable to change your password" => "Невъзможна промяна на паролата",
 "Current password" => "Текуща парола",
 "New password" => "Нова парола",
 "show" => "показва",
 "Change password" => "Промяна на парола",
+"Email" => "Е-поща",
+"Your email address" => "Адресът на е-пощата ви",
+"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
 "Language" => "Език",
+"Help translate" => "Помощ за превода",
 "use this address to connect to your ownCloud in your file manager" => "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър",
 "Name" => "Име",
 "Password" => "Парола",
 "Groups" => "Групи",
 "Create" => "Ново",
+"Default Quota" => "Квота по подразбиране",
+"Quota" => "Квота",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index c22ca72396aaa4a567460d8e40a5f3587e0ef8d6..87f75a2015fb1fae77e1f512dd20434ecc0e4f8f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -5,8 +5,8 @@
 "Invalid request" => "Requête invalide",
 "Authentication error" => "Erreur d'authentification",
 "Language changed" => "Langue changée",
-"Disable" => "Désactivé",
-"Enable" => "Activé",
+"Disable" => "Désactiver",
+"Enable" => "Activer",
 "Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
 "Security Warning" => "Alertes de sécurité",
@@ -24,7 +24,7 @@
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
 "You use" => "Vous utilisez",
-"of the available" => "d'espace de stockage sur un total de",
+"of the available" => "de votre espace de stockage d'une taille totale de",
 "Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
 "Download" => "Télécharger",
 "Your password got changed" => "Votre mot de passe a été changé",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 253625b4867933bbabefea51f572fcf20ff5b0e4..ac169fa3987c872bbb996ba4ec969ceab94ac0a7 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
+"Authentication error" => "Ошибка авторизации",
 "Language changed" => "Язык изменён",
 "Disable" => "Отключить",
 "Enable" => "Включить",
 "Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
+"Security Warning" => "Предупреждение безопасности",
 "Log" => "Журнал",
 "More" => "Ещё",
 "Add your App" => "Добавить приложение",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 42e6eac5f3667653899c3e5d3948767100a2d808..e4907dfba98093a1637075913df389d3ecdd7d18 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
+"Authentication error" => "Eşleşme hata",
 "Language changed" => "Dil değiştirildi",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
 "Saving..." => "Kaydediliyor...",
 "__language_name__" => "__dil_adı__",
+"Security Warning" => "Güvenlik Uyarisi",
 "Log" => "Günlük",
 "More" => "Devamı",
 "Add your App" => "Uygulamanı Ekle",
@@ -43,6 +45,8 @@
 "Create" => "Oluştur",
 "Default Quota" => "Varsayılan Kota",
 "Other" => "Diğer",
+"SubAdmin" => "Alt Yönetici",
 "Quota" => "Kota",
+"SubAdmin for ..." => "Alt yönetici için ...",
 "Delete" => "Sil"
 );
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
new file mode 100644
index 0000000000000000000000000000000000000000..7331ff324c1f0ca113be076e1bd9a2ce646aa98f
--- /dev/null
+++ b/settings/l10n/uk.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID змінено",
+"Invalid request" => "Помилковий запит",
+"Language changed" => "Мова змінена",
+"Select an App" => "Вибрати додаток",
+"-licensed" => "-ліцензовано",
+"by" => "по",
+"Ask a question" => "Запитати",
+"Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
+"You use" => "Ви використовуєте",
+"of the available" => "з доступної",
+"Your password got changed" => "Ваш пароль змінено",
+"Current password" => "Поточний пароль",
+"New password" => "Новий пароль",
+"show" => "показати",
+"Change password" => "Змінити пароль",
+"Language" => "Мова",
+"Name" => "Ім'я",
+"Password" => "Пароль",
+"Groups" => "Групи",
+"Create" => "Створити",
+"Delete" => "Видалити"
+);