diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
index 2b3a0c97bea99d898198a6d9c7b50f3b324a9db9..317d3ce386fbd1e8d6b920bb9e4899d936fc9785 100644
--- a/apps/contacts/l10n/ar.php
+++ b/apps/contacts/l10n/ar.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
 "There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
+"Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
+"Error updating 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." => "هذا ليس دفتر عناوينك.",
@@ -26,10 +26,6 @@
 "Birthday" => "تاريخ الميلاد",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
-"New Address Book" => "كتاب عناوين جديد",
-"CardDav Link" => "وصلة CardDav",
-"Download" => "انزال",
-"Edit" => "تعديل",
 "Delete" => "حذف",
 "Preferred" => "مفضل",
 "Phone" => "الهاتف",
@@ -49,5 +45,8 @@
 "Active" => "فعال",
 "Save" => "حفظ",
 "Submit" => "ارسال",
-"Cancel" => "الغاء"
+"Cancel" => "الغاء",
+"Download" => "انزال",
+"Edit" => "تعديل",
+"New Address Book" => "كتاب عناوين جديد"
 );
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 256182f02cd53cb17e7559503552eb1c4d587b04..4bb667a955f2447c9532e4a4035de49471e70294 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
 "There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
 "element name is not set." => "no s'ha establert el nom de l'element.",
 "id is not set." => "no s'ha establert la id.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
 "Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
 "Error adding contact property: " => "Error en afegir la propietat del contacte:",
+"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
+"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
+"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
 "No ID provided" => "No heu facilitat cap ID",
 "Error setting checksum." => "Error en establir la suma de verificació.",
 "No categories selected for deletion." => "No heu seleccionat les categories a eliminar.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
 "Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
 "Error updating contact property." => "Error en actualitzar la propietat del contacte.",
-"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
-"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
 "Error uploading contacts to storage." => "Error en carregar contactes a l'emmagatzemament.",
 "There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer carregat supera la directiva upload_max_filesize de php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Resultat: ",
 " imported, " => " importat, ",
 " failed." => " fallada.",
-"Addressbook not found." => "No s'ha trobat la llibreta d'adreces.",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Address" => "Adreça",
@@ -100,6 +99,7 @@
 "{name}'s Birthday" => "Aniversari de {name}",
 "Add Contact" => "Afegeix un contacte",
 "Import" => "Importa",
+"Settings" => "Configuració",
 "Addressbooks" => "Llibretes d'adreces",
 "Close" => "Tanca",
 "Keyboard shortcuts" => "Dreceres de teclat",
@@ -113,12 +113,6 @@
 "Add new contact" => "Afegeix un contacte nou",
 "Add new addressbook" => "Afegeix una llibreta d'adreces nova",
 "Delete current contact" => "Esborra el contacte",
-"Configure Address Books" => "Configura les llibretes d'adreces",
-"New Address Book" => "Nova llibreta d'adreces",
-"CardDav Link" => "Enllaç CardDav",
-"Download" => "Baixa",
-"Edit" => "Edita",
-"Delete" => "Suprimeix",
 "Drop photo to upload" => "Elimina la foto a carregar",
 "Delete current photo" => "Elimina la foto actual",
 "Edit current photo" => "Edita la foto actual",
@@ -126,6 +120,7 @@
 "Select photo from ownCloud" => "Selecciona una foto de ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma",
 "Edit name details" => "Edita detalls del nom",
+"Delete" => "Suprimeix",
 "Nickname" => "Sobrenom",
 "Enter nickname" => "Escriviu el sobrenom",
 "Web site" => "Adreça web",
@@ -206,5 +201,7 @@
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Enllaç(os) vCard només de lectura"
+"Download" => "Baixa",
+"Edit" => "Edita",
+"New Address Book" => "Nova llibreta d'adreces"
 );
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 834fa472405996115c969912561fef718e9b1a00..e0f70b1c6411db93db6b190c8387bea5085711b9 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
+"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
+"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
 "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í.",
@@ -34,8 +36,6 @@
 "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. ",
 "Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
-"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
-"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
 "Error uploading contacts to storage." => "Chyba při nahrávání kontaktů do úložiště.",
 "There is no error, the file uploaded with success" => "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini",
@@ -62,7 +62,6 @@
 "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.",
 "Address" => "Adresa",
@@ -85,12 +84,6 @@
 "Import" => "Import",
 "Addressbooks" => "Adresáře",
 "Close" => "Zavřít",
-"Configure Address Books" => "Nastavit adresáře",
-"New Address Book" => "Nový adresář",
-"CardDav Link" => "CardDav odkaz",
-"Download" => "Stažení",
-"Edit" => "Editovat",
-"Delete" => "Odstranit",
 "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",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Odstranit",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
 "dd-mm-yyyy" => "dd. mm. yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Adresa pro synchronizaci pomocí CardDAV:",
 "more info" => "víc informací",
 "Primary address (Kontact et al)" => "Hlavní adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Stažení",
+"Edit" => "Editovat",
+"New Address Book" => "Nový adresář"
 );
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
index cae783d2972f82193619848e291994228fccd9ea..1744199af205ee8d74af4b3e53d5c40eee24d60c 100644
--- a/apps/contacts/l10n/da.php
+++ b/apps/contacts/l10n/da.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
+"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
+"Error updating addressbook." => "Fejl ved opdatering af adressebog",
 "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.",
@@ -34,8 +36,6 @@
 "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. ",
 "Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
-"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
-"Error updating addressbook." => "Fejl ved opdatering af adressebog",
 "Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
 "There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
@@ -62,7 +62,6 @@
 "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.",
 "Address" => "Adresse",
@@ -85,12 +84,6 @@
 "Import" => "Importer",
 "Addressbooks" => "Adressebøger",
 "Close" => "Luk",
-"Configure Address Books" => "Konfigurer adressebøger",
-"New Address Book" => "Ny adressebog",
-"CardDav Link" => "CardDav-link",
-"Download" => "Download",
-"Edit" => "Rediger",
-"Delete" => "Slet",
 "Drop photo to upload" => "Drop foto for at uploade",
 "Delete current photo" => "Slet nuværende foto",
 "Edit current photo" => "Rediger nuværende foto",
@@ -98,6 +91,7 @@
 "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.",
+"Delete" => "Slet",
 "Nickname" => "Kaldenavn",
 "Enter nickname" => "Indtast kaldenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
 "more info" => "mere info",
 "Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Download",
+"Edit" => "Rediger",
+"New Address Book" => "Ny adressebog"
 );
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index b76c5ce07160bcb644b81557776fa6d0845bbc23..2d1a3cdb2dae5e8da43178857f7a57299120a8c3 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
 "There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
 "element name is not set." => "Kein Name für das Element angegeben.",
 "id is not set." => "ID ist nicht angegeben.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
 "Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
 "Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
+"Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
+"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
+"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
 "No ID provided" => "Keine ID angegeben",
 "Error setting checksum." => "Fehler beim Setzen der Prüfsumme.",
 "No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
 "Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
 "Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
-"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
-"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
 "Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen",
 "There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt",
@@ -66,7 +66,6 @@
 "Result: " => "Ergebnis: ",
 " imported, " => " importiert, ",
 " failed." => " fehlgeschlagen.",
-"Addressbook not found." => "Adressbuch nicht gefunden.",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
 "Address" => "Adresse",
@@ -100,6 +99,7 @@
 "{name}'s Birthday" => "Geburtstag von {name}",
 "Add Contact" => "Kontakt hinzufügen",
 "Import" => "Importieren",
+"Settings" => "Einstellungen",
 "Addressbooks" => "Adressbücher",
 "Close" => "Schließen",
 "Keyboard shortcuts" => "Tastaturbefehle",
@@ -113,12 +113,6 @@
 "Add new contact" => "Neuen Kontakt hinzufügen",
 "Add new addressbook" => "Neues Adressbuch hinzufügen",
 "Delete current contact" => "Aktuellen Kontakt löschen",
-"Configure Address Books" => "Adressbücher konfigurieren",
-"New Address Book" => "Neues Adressbuch",
-"CardDav Link" => "CardDav-Link",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
-"Delete" => "Löschen",
 "Drop photo to upload" => "Zieh' ein Foto hierher zum Hochladen",
 "Delete current photo" => "Derzeitiges Foto löschen",
 "Edit current photo" => "Foto ändern",
@@ -126,6 +120,7 @@
 "Select photo from ownCloud" => "Foto aus ownCloud auswählen",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
 "Edit name details" => "Name ändern",
+"Delete" => "Löschen",
 "Nickname" => "Spitzname",
 "Enter nickname" => "Spitzname angeben",
 "Web site" => "Webseite",
@@ -206,5 +201,7 @@
 "more info" => "mehr Info",
 "Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
+"Download" => "Herunterladen",
+"Edit" => "Bearbeiten",
+"New Address Book" => "Neues Adressbuch"
 );
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index c67f27ab2aa19431e4048c22fd8173b5c2406a32..d4070c2c8c6e7f9c95ec926f3b838c25db6f6b35 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
 "There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
 "element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
 "id is not set." => "δεν ορίστηκε id",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
 "Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
 "Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
+"Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
+"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
+"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
 "No ID provided" => "Δε δόθηκε ID",
 "Error setting checksum." => "Λάθος κατά τον ορισμό checksum ",
 "No categories selected for deletion." => "Δε επελέγησαν κατηγορίες για διαγραφή",
@@ -36,8 +38,6 @@
 "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",
@@ -66,7 +66,6 @@
 "Result: " => "Αποτέλεσμα: ",
 " imported, " => " εισάγεται,",
 " failed." => " απέτυχε.",
-"Addressbook not found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
 "Address" => "Διεύθυνση",
@@ -113,12 +112,6 @@
 "Add new contact" => "Προσθήκη νέας επαφής",
 "Add new addressbook" => "Προσθήκη νέου βιβλίου επαφών",
 "Delete current contact" => "Διαγραφή τρέχουσας επαφής",
-"Configure Address Books" => "Ρυθμίστε το βιβλίο διευθύνσεων ",
-"New Address Book" => "Νέο βιβλίο διευθύνσεων",
-"CardDav Link" => "Σύνδεσμος CardDav",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"Delete" => "Διαγραφή",
 "Drop photo to upload" => "Ρίξε μια φωτογραφία για ανέβασμα",
 "Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
 "Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
@@ -126,6 +119,7 @@
 "Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα",
 "Edit name details" => "Αλλάξτε τις λεπτομέρειες ονόματος",
+"Delete" => "Διαγραφή",
 "Nickname" => "Παρατσούκλι",
 "Enter nickname" => "Εισάγετε παρατσούκλι",
 "Web site" => "Ιστότοπος",
@@ -206,5 +200,7 @@
 "more info" => "περισσότερες πληροφορίες",
 "Primary address (Kontact et al)" => "Κύρια διεύθυνση",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
+"Download" => "Λήψη",
+"Edit" => "Επεξεργασία",
+"New Address Book" => "Νέο βιβλίο διευθύνσεων"
 );
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
index e62077fe5d399dc48e23c9f15dbbd2d81f982357..a1aaea2a6528455dcd51f6cf6167b498fe237cac 100644
--- a/apps/contacts/l10n/eo.php
+++ b/apps/contacts/l10n/eo.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
+"Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
+"Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
 "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.",
@@ -34,8 +36,6 @@
 "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",
@@ -57,7 +57,6 @@
 "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.",
 "Address" => "Adreso",
@@ -80,12 +79,6 @@
 "Import" => "Enporti",
 "Addressbooks" => "Adresaroj",
 "Close" => "Fermi",
-"Configure Address Books" => "Agordi adresarojn",
-"New Address Book" => "Nova adresaro",
-"CardDav Link" => "CardDav-ligilo",
-"Download" => "Elŝuti",
-"Edit" => "Redakti",
-"Delete" => "Forigi",
 "Drop photo to upload" => "Demeti foton por alŝuti",
 "Delete current photo" => "Forigi nunan foton",
 "Edit current photo" => "Redakti nunan foton",
@@ -93,6 +86,7 @@
 "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",
+"Delete" => "Forigi",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
 "dd-mm-yyyy" => "yyyy-mm-dd",
@@ -153,5 +147,8 @@
 "CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
 "more info" => "pli da informo",
 "Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Elŝuti",
+"Edit" => "Redakti",
+"New Address Book" => "Nova adresaro"
 );
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index 813cedc6e8a8585e1e8f5bc67975b59571051433..a7f1b1219cc5bc476aeb4402ae4eeafafe114765 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
+"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
+"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
 "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.",
@@ -34,8 +36,6 @@
 "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.",
 "Error updating contact property." => "Error al actualizar una propiedad del contacto.",
-"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
-"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
 "Error uploading contacts to storage." => "Error al subir contactos al almacenamiento.",
 "There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini",
@@ -62,7 +62,6 @@
 "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.",
 "Address" => "Dirección",
@@ -85,12 +84,6 @@
 "Import" => "Importar",
 "Addressbooks" => "Libretas de direcciones",
 "Close" => "Cierra.",
-"Configure Address Books" => "Configurar libretas de direcciones",
-"New Address Book" => "Nueva libreta de direcciones",
-"CardDav Link" => "Enlace CardDav",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Borrar",
 "Drop photo to upload" => "Suelta una foto para subirla",
 "Delete current photo" => "Eliminar fotografía actual",
 "Edit current photo" => "Editar fotografía actual",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Borrar",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Sincronizando direcciones",
 "more info" => "más información",
 "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Descargar",
+"Edit" => "Editar",
+"New Address Book" => "Nueva libreta de direcciones"
 );
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index 08b110ca2328044623053afc311027fb0786c80e..0589e2ec07d44eec1e378ef76aa6440f0e3412b2 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
+"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
+"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
 "No ID provided" => "ID-d pole sisestatud",
 "Error setting checksum." => "Viga kontrollsumma määramisel.",
 "No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
@@ -34,8 +36,6 @@
 "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.",
 "Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
-"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
-"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
 "Error uploading contacts to storage." => "Viga kontaktide üleslaadimisel kettale.",
 "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse",
@@ -59,7 +59,6 @@
 "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.",
 "Address" => "Aadress",
@@ -82,12 +81,6 @@
 "Import" => "Impordi",
 "Addressbooks" => "Aadressiraamatud",
 "Close" => "Sule",
-"Configure Address Books" => "Seadista aadressiraamatut",
-"New Address Book" => "Uus aadressiraamat",
-"CardDav Link" => "CardDav link",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"Delete" => "Kustuta",
 "Drop photo to upload" => "Lohista üleslaetav foto siia",
 "Delete current photo" => "Kustuta praegune foto",
 "Edit current photo" => "Muuda praegust pilti",
@@ -95,6 +88,7 @@
 "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",
+"Delete" => "Kustuta",
 "Nickname" => "Hüüdnimi",
 "Enter nickname" => "Sisesta hüüdnimi",
 "dd-mm-yyyy" => "dd.mm.yyyy",
@@ -163,5 +157,8 @@
 "CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
 "more info" => "lisainfo",
 "Primary address (Kontact et al)" => "Peamine aadress",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Lae alla",
+"Edit" => "Muuda",
+"New Address Book" => "Uus aadressiraamat"
 );
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index 3e78c84d39c7d67a57a67b6ce7d227cca14ac7b6..c57e7ea416156592403d9e7c1b9c52237608348a 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -1,11 +1,15 @@
 <?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.",
+"Could not parse contact: " => "Ezin izan da kontaktua analizatu:",
 "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.",
 "Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
+"Error adding contact property: " => "Errore bat egon da kontaktuaren propietatea gehitzean:",
+"Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
+"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.",
 "No ID provided" => "Ez da IDrik eman",
 "Error setting checksum." => "Errorea kontrol-batura ezartzean.",
 "No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
@@ -33,8 +37,6 @@
 "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",
@@ -51,6 +53,8 @@
 "Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
 "Error" => "Errorea",
 "Contact" => "Kontaktua",
+"New" => "Berria",
+"New Contact" => "Kontaktu berria",
 "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",
@@ -61,7 +65,6 @@
 "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.",
 "Address" => "Helbidea",
@@ -79,25 +82,45 @@
 "Pager" => "Bilagailua",
 "Internet" => "Internet",
 "Birthday" => "Jaioteguna",
+"Call" => "Deia",
+"Clients" => "Bezeroak",
+"Holidays" => "Oporrak",
+"Ideas" => "Ideiak",
+"Journey" => "Bidaia",
+"Meeting" => "Bilera",
+"Other" => "Bestelakoa",
+"Personal" => "Pertsonala",
+"Projects" => "Proiektuak",
+"Questions" => "Galderak",
 "{name}'s Birthday" => "{name}ren jaioteguna",
 "Add Contact" => "Gehitu kontaktua",
 "Import" => "Inportatu",
+"Settings" => "Ezarpenak",
 "Addressbooks" => "Helbide Liburuak",
 "Close" => "Itxi",
-"Configure Address Books" => "Konfiguratu Helbide Liburuak",
-"New Address Book" => "Helbide-liburu berria",
-"CardDav Link" => "CardDav lotura",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"Delete" => "Ezabatu",
+"Keyboard shortcuts" => "Teklatuaren lasterbideak",
+"Navigation" => "Nabigazioa",
+"Next contact in list" => "Hurrengoa kontaktua zerrendan",
+"Previous contact in list" => "Aurreko kontaktua zerrendan",
+"Expand/collapse current addressbook" => "Zabaldu/tolestu uneko helbide-liburua",
+"Next/previous addressbook" => "Hurrengo/aurreko helbide-liburua",
+"Actions" => "Ekintzak",
+"Refresh contacts list" => "Gaurkotu kontaktuen zerrenda",
+"Add new contact" => "Gehitu kontaktu berria",
+"Add new addressbook" => "Gehitu helbide-liburu berria",
+"Delete current contact" => "Ezabatu uneko kontaktuak",
 "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",
+"Delete" => "Ezabatu",
 "Nickname" => "Ezizena",
 "Enter nickname" => "Sartu ezizena",
+"Web site" => "Web orria",
+"http://www.somesite.com" => "http://www.webgunea.com",
+"Go to web site" => "Web orrira joan",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Taldeak",
 "Separate groups with commas" => "Banatu taldeak komekin",
@@ -121,10 +144,14 @@
 "Edit address" => "Editatu helbidea",
 "Type" => "Mota",
 "PO Box" => "Posta kutxa",
+"Street address" => "Kalearen helbidea",
+"Street and number" => "Kalea eta zenbakia",
 "Extended" => "Hedatua",
+"Apartment number etc." => "Etxe zenbakia eab.",
 "City" => "Hiria",
 "Region" => "Eskualdea",
 "Zipcode" => "Posta kodea",
+"Postal code" => "Posta kodea",
 "Country" => "Herrialdea",
 "Addressbook" => "Helbide-liburua",
 "New Addressbook" => "Helbide-liburu berria",
@@ -142,8 +169,14 @@
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
 "Configure addressbooks" => "Konfiguratu helbide liburuak",
+"Select Address Books" => "Hautatu helbide-liburuak",
+"Enter name" => "Sartu izena",
+"Enter description" => "Sartu deskribapena",
 "CardDAV syncing addresses" => "CardDAV sinkronizazio helbideak",
 "more info" => "informazio gehiago",
 "Primary address (Kontact et al)" => "Helbide nagusia",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Deskargatu",
+"Edit" => "Editatu",
+"New Address Book" => "Helbide-liburu berria"
 );
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 08b4eb221bd673910320807aecceec2d15fdbd64..c25bf9ca0c8870c8e98c38870e276d47b31bf536 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
+"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
+"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
 "No ID provided" => "هیچ شناسه ای ارائه نشده",
 "Error setting checksum." => "خطا در تنظیم checksum",
 "No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
 "Something went FUBAR. " => "چند چیز به 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 تعیین می شود",
@@ -62,7 +62,6 @@
 "Result: " => "نتیجه:",
 " imported, " => "وارد شد،",
 " failed." => "ناموفق",
-"Addressbook not found." => "کتابچه نشانی ها یافت نشد",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
 "Address" => "نشانی",
@@ -85,12 +84,6 @@
 "Import" => "وارد کردن",
 "Addressbooks" => "کتابچه ی نشانی ها",
 "Close" => "بستن",
-"Configure Address Books" => "پیکر بندی کتابچه نشانی ها",
-"New Address Book" => "کتابچه نشانه های جدید",
-"CardDav Link" => "CardDav Link",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"Delete" => "پاک کردن",
 "Drop photo to upload" => "تصویر را به اینجا بکشید تا بار گذازی شود",
 "Delete current photo" => "پاک کردن تصویر کنونی",
 "Edit current photo" => "ویرایش تصویر کنونی",
@@ -98,6 +91,7 @@
 "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" => "ویرایش نام جزئیات",
+"Delete" => "پاک کردن",
 "Nickname" => "نام مستعار",
 "Enter nickname" => "یک نام مستعار وارد کنید",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV syncing addresses ",
 "more info" => "اطلاعات بیشتر",
 "Primary address (Kontact et al)" => "نشانی اولیه",
-"iOS/OS X" => "iOS/OS X "
+"iOS/OS X" => "iOS/OS X ",
+"Download" => "بارگیری",
+"Edit" => "ویرایش",
+"New Address Book" => "کتابچه نشانه های جدید"
 );
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
index 5c9a81eba08c54addf95b73bd847496697afda4f..86581f11e94e8366affaa8fdc42386014c63345c 100644
--- a/apps/contacts/l10n/fi_FI.php
+++ b/apps/contacts/l10n/fi_FI.php
@@ -2,6 +2,7 @@
 "There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
 "Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
 "At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
+"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
 "No address books found." => "Osoitekirjoja ei löytynyt.",
 "No contacts found." => "Yhteystietoja ei löytynyt.",
@@ -16,7 +17,6 @@
 "Error cropping image" => "Virhe rajatessa kuvaa",
 "Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
 "Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
-"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
@@ -33,7 +33,6 @@
 "Result: " => "Tulos: ",
 " imported, " => " tuotu, ",
 " failed." => " epäonnistui.",
-"Addressbook not found." => "Osoitekirjaa ei löytynyt.",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
 "Address" => "Osoite",
@@ -64,17 +63,12 @@
 "Add new contact" => "Lisää uusi yhteystieto",
 "Add new addressbook" => "Lisää uusi osoitekirja",
 "Delete current contact" => "Poista nykyinen yhteystieto",
-"Configure Address Books" => "Muokkaa osoitekirjoja",
-"New Address Book" => "Uusi osoitekirja",
-"CardDav Link" => "CardDav-linkki",
-"Download" => "Lataa",
-"Edit" => "Muokkaa",
-"Delete" => "Poista",
 "Delete current photo" => "Poista nykyinen valokuva",
 "Edit current photo" => "Muokkaa nykyistä valokuvaa",
 "Upload new photo" => "Lähetä uusi valokuva",
 "Select photo from ownCloud" => "Valitse valokuva ownCloudista",
 "Edit name details" => "Muokkaa nimitietoja",
+"Delete" => "Poista",
 "Nickname" => "Kutsumanimi",
 "Enter nickname" => "Anna kutsumanimi",
 "Web site" => "Verkkosivu",
@@ -131,5 +125,8 @@
 "Enter name" => "Anna nimi",
 "Enter description" => "Anna kuvaus",
 "CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"New Address Book" => "Uusi osoitekirja"
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index dd59a68aaf20624c32b10505838bfe92a98eeb30..a3f90001e5ae91f3dadfbc6f19c5e895e4c67eb4 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
 "There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
 "element name is not set." => "Le champ Nom n'est pas défini.",
 "id is not set." => "L'ID n'est pas défini.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
 "Trying to add duplicate property: " => "Ajout d'une propriété en double:",
 "Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
+"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
+"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
+"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
 "No ID provided" => "Aucun ID fourni",
 "Error setting checksum." => "Erreur lors du paramétrage du hachage.",
 "No categories selected for deletion." => "Pas de catégories sélectionnées pour la suppression.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
 "Something went FUBAR. " => "Quelque chose est FUBAR.",
 "Error updating contact property." => "Erreur lors de la mise à jour du champ.",
-"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
-"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
 "Error uploading contacts to storage." => "Erreur lors de l'envoi des contacts vers le stockage.",
 "There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Résultat :",
 " imported, " => "importé,",
 " failed." => "échoué.",
-"Addressbook not found." => "Carnet d'adresses introuvable.",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
 "Address" => "Adresse",
@@ -113,12 +112,6 @@
 "Add new contact" => "Ajouter un nouveau contact",
 "Add new addressbook" => "Ajouter un nouveau carnet d'adresses",
 "Delete current contact" => "Effacer le contact sélectionné",
-"Configure Address Books" => "Paramétrer carnet d'adresses",
-"New Address Book" => "Nouveau Carnet d'adresses",
-"CardDav Link" => "Lien CardDav",
-"Download" => "Télécharger",
-"Edit" => "Modifier",
-"Delete" => "Supprimer",
 "Drop photo to upload" => "Glisser une photo pour l'envoi",
 "Delete current photo" => "Supprimer la photo actuelle",
 "Edit current photo" => "Editer la photo actuelle",
@@ -126,6 +119,7 @@
 "Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule",
 "Edit name details" => "Editer les noms",
+"Delete" => "Supprimer",
 "Nickname" => "Surnom",
 "Enter nickname" => "Entrer un surnom",
 "Web site" => "Page web",
@@ -206,5 +200,7 @@
 "more info" => "Plus d'infos",
 "Primary address (Kontact et al)" => "Adresse principale",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Lien(s) vers le répertoire de vCards en lecture seule"
+"Download" => "Télécharger",
+"Edit" => "Modifier",
+"New Address Book" => "Nouveau Carnet d'adresses"
 );
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
index a822b55469c623039db65efe505daabc14663ebc..ac4f5f95ae42ebb0234260db95e11d232f0cd8de 100644
--- a/apps/contacts/l10n/gl.php
+++ b/apps/contacts/l10n/gl.php
@@ -1,11 +1,13 @@
 <?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.",
 "Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
+"Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
+"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.",
 "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.",
@@ -33,8 +35,6 @@
 "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",
@@ -61,7 +61,6 @@
 "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",
@@ -84,12 +83,6 @@
 "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",
 "Drop photo to upload" => "Solte a foto a subir",
 "Delete current photo" => "Borrar foto actual",
 "Edit current photo" => "Editar a foto actual",
@@ -97,6 +90,7 @@
 "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",
+"Delete" => "Eliminar",
 "Nickname" => "Apodo",
 "Enter nickname" => "Introuza apodo",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -165,5 +159,8 @@
 "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"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Descargar",
+"Edit" => "Editar",
+"New Address Book" => "Nova axenda"
 );
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
index e4fffbbf72116bada9788c8024aa9b878e51490a..3b4324c5dfc0ec973890113b7662c9fd1ff59215 100644
--- a/apps/contacts/l10n/he.php
+++ b/apps/contacts/l10n/he.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
+"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
+"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
 "No ID provided" => "לא צוין מזהה",
 "Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
 "No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
@@ -31,8 +33,6 @@
 "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",
@@ -42,7 +42,6 @@
 "Missing a temporary folder" => "תקיה זמנית חסרה",
 "Contacts" => "אנשי קשר",
 "Contact" => "איש קשר",
-"Addressbook not found." => "ספר כתובות לא נמצא",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
 "Address" => "כתובת",
@@ -64,18 +63,13 @@
 "Add Contact" => "הוספת איש קשר",
 "Import" => "יבא",
 "Addressbooks" => "פנקסי כתובות",
-"Configure Address Books" => "הגדר ספרי כתובות",
-"New Address Book" => "פנקס כתובות חדש",
-"CardDav Link" => "קישור ",
-"Download" => "הורדה",
-"Edit" => "עריכה",
-"Delete" => "מחיקה",
 "Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
 "Delete current photo" => "מחק תמונה נוכחית",
 "Edit current photo" => "ערוך תמונה נוכחית",
 "Upload new photo" => "העלה תמונה חדשה",
 "Select photo from ownCloud" => "בחר תמונה מ ownCloud",
 "Edit name details" => "ערוך פרטי שם",
+"Delete" => "מחיקה",
 "Nickname" => "כינוי",
 "Enter nickname" => "הכנס כינוי",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -143,5 +137,8 @@
 "CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
 "more info" => "מידע נוסף",
 "Primary address (Kontact et al)" => "כתובת ראשית",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "הורדה",
+"Edit" => "עריכה",
+"New Address Book" => "פנקס כתובות חדש"
 );
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
index c0ba8afbf6be2150fbbacc1ed388702158b00902..220794f8c4a8755a7134174d866c40dd7b87f554 100644
--- a/apps/contacts/l10n/hr.php
+++ b/apps/contacts/l10n/hr.php
@@ -1,11 +1,13 @@
 <?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:",
+"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
+"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
+"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
 "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.",
@@ -27,8 +29,6 @@
 "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",
@@ -38,7 +38,6 @@
 "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",
@@ -60,15 +59,10 @@
 "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",
 "Drop photo to upload" => "Dovucite fotografiju za slanje",
 "Edit current photo" => "Uredi trenutnu sliku",
 "Edit name details" => "Uredi detalje imena",
+"Delete" => "Obriši",
 "Nickname" => "Nadimak",
 "Enter nickname" => "Unesi nadimank",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -100,5 +94,8 @@
 "Active" => "Aktivno",
 "Save" => "Spremi",
 "Submit" => "Pošalji",
-"Cancel" => "Prekini"
+"Cancel" => "Prekini",
+"Download" => "Preuzimanje",
+"Edit" => "Uredi",
+"New Address Book" => "Novi adresar"
 );
diff --git a/apps/contacts/l10n/hu_HU.php b/apps/contacts/l10n/hu_HU.php
index 5db680b1ac55e70d30ed517c68cd346b7c800544..6745d68a2fe03b5fe1ccfe1b45aa09553dcad910 100644
--- a/apps/contacts/l10n/hu_HU.php
+++ b/apps/contacts/l10n/hu_HU.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
+"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
+"Error updating addressbook." => "Hiba a címlista frissítésekor",
 "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",
@@ -34,8 +36,6 @@
 "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.",
 "Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
-"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
-"Error updating addressbook." => "Hiba a címlista frissítésekor",
 "Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
@@ -62,7 +62,6 @@
 "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ó.",
 "Address" => "Cím",
@@ -85,12 +84,6 @@
 "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",
-"CardDav Link" => "CardDav hivatkozás",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"Delete" => "Törlés",
 "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",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Törlés",
 "Nickname" => "Becenév",
 "Enter nickname" => "Becenév megadása",
 "dd-mm-yyyy" => "yyyy-mm-dd",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
 "more info" => "további információ",
 "Primary address (Kontact et al)" => "Elsődleges cím",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Letöltés",
+"Edit" => "Szerkesztés",
+"New Address Book" => "Új címlista"
 );
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index 0fbe1777f5dc3f3492b50c4ce8e615a28244b400..ceb80a9874a7d592d886251ee54be0850c5a3e97 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -8,7 +8,6 @@
 "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",
 "Address" => "Adresse",
@@ -29,15 +28,11 @@
 "Add Contact" => "Adder contacto",
 "Import" => "Importar",
 "Addressbooks" => "Adressarios",
-"New Address Book" => "Nove adressario",
-"CardDav Link" => "Ligamine CardDav",
-"Download" => "Discargar",
-"Edit" => "Modificar",
-"Delete" => "Deler",
 "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",
+"Delete" => "Deler",
 "Nickname" => "Pseudonymo",
 "Enter nickname" => "Inserer pseudonymo",
 "Groups" => "Gruppos",
@@ -84,5 +79,8 @@
 "Name of new addressbook" => "Nomine del nove gruppo:",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Discargar",
+"Edit" => "Modificar",
+"New Address Book" => "Nove adressario"
 );
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index b80bde0d4210ca74f9373c9408c8d16a15baaa77..eff63acf97746817e5f5ba10319b5d03f23e559f 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
 "There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
 "element name is not set." => "il nome dell'elemento non è impostato.",
 "id is not set." => "ID non impostato.",
@@ -8,6 +7,9 @@
 "At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo.",
 "Trying to add duplicate property: " => "P",
 "Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
+"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
+"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
+"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
 "No ID provided" => "Nessun ID fornito",
 "Error setting checksum." => "Errore di impostazione del codice di controllo.",
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
@@ -36,8 +38,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
 "Something went FUBAR. " => "Qualcosa è andato storto. ",
 "Error updating contact property." => "Errore durante l'aggiornamento della proprietà del contatto.",
-"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
-"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
 "Error uploading contacts to storage." => "Errore di invio dei contatti in archivio.",
 "There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato inviato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file inviato supera la direttiva upload_max_filesize nel php.ini",
@@ -66,7 +66,6 @@
 "Result: " => "Risultato: ",
 " imported, " => " importato, ",
 " failed." => " non riuscito.",
-"Addressbook not found." => "Rubrica non trovata.",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
 "Address" => "Indirizzo",
@@ -114,12 +113,6 @@
 "Add new contact" => "Aggiungi un nuovo contatto",
 "Add new addressbook" => "Aggiungi una nuova rubrica",
 "Delete current contact" => "Elimina il contatto corrente",
-"Configure Address Books" => "Configura rubrica",
-"New Address Book" => "Nuova rubrica",
-"CardDav Link" => "Link CardDav",
-"Download" => "Scarica",
-"Edit" => "Modifica",
-"Delete" => "Elimina",
 "Drop photo to upload" => "Rilascia una foto da inviare",
 "Delete current photo" => "Elimina la foto corrente",
 "Edit current photo" => "Modifica la foto corrente",
@@ -127,6 +120,7 @@
 "Select photo from ownCloud" => "Seleziona la foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola",
 "Edit name details" => "Modifica dettagli del nome",
+"Delete" => "Elimina",
 "Nickname" => "Pseudonimo",
 "Enter nickname" => "Inserisci pseudonimo",
 "Web site" => "Sito web",
@@ -207,5 +201,7 @@
 "more info" => "altre informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Collegamento(i) cartella vCard sola lettura"
+"Download" => "Scarica",
+"Edit" => "Modifica",
+"New Address Book" => "Nuova rubrica"
 );
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 014dd7a3b187d72111c693af139b38bb82ff52d4..ad83d32e5cd3a4e40e390dc9fa5c21dd30269927 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -1,11 +1,14 @@
 <?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つは入力して下さい。",
 "Trying to add duplicate property: " => "重複する属性を追加: ",
+"Error adding contact property: " => "コンタクト属性の追加エラー: ",
+"Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
+"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
 "No ID provided" => "IDが提供されていません",
 "Error setting checksum." => "チェックサムの設定エラー。",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
@@ -32,8 +35,6 @@
 "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 内の upload_max_filesize の制限を超えています",
@@ -50,6 +51,8 @@
 "Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
 "Error" => "エラー",
 "Contact" => "連絡先",
+"New" => "新規",
+"New 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 へ報告してください。",
@@ -60,7 +63,6 @@
 "Result: " => "結果: ",
 " imported, " => " をインポート、 ",
 " failed." => " は失敗しました。",
-"Addressbook not found." => "アドレスブックが見つかりませんでした。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -78,25 +80,42 @@
 "Pager" => "ポケベル",
 "Internet" => "インターネット",
 "Birthday" => "誕生日",
+"Business" => "ビジネス",
+"Clients" => "顧客",
+"Deliverer" => "運送会社",
+"Holidays" => "休日",
+"Ideas" => "アイデア",
+"Journey" => "旅行",
+"Jubilee" => "記念祭",
+"Meeting" => "打ち合わせ",
+"Other" => "その他",
+"Personal" => "個人",
+"Projects" => "プロジェクト",
+"Questions" => "質問",
 "{name}'s Birthday" => "{name}の誕生日",
 "Add Contact" => "連絡先の追加",
 "Import" => "インポート",
+"Settings" => "設定",
 "Addressbooks" => "電話帳",
 "Close" => "閉じる",
-"Configure Address Books" => "アドレスブックを設定",
-"New Address Book" => "新規電話帳",
-"CardDav Link" => "CardDAVリンク",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"Delete" => "削除",
+"Keyboard shortcuts" => "キーボードショートカット",
+"Navigation" => "ナビゲーション",
+"Next contact in list" => "リスト内の次のコンタクト",
+"Previous contact in list" => "リスト内の前のコンタクト",
+"Add new contact" => "新しいコンタクトを追加",
+"Add new addressbook" => "新しいアドレスブックを追加",
+"Delete current contact" => "現在のコンタクトを削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
 "Delete current photo" => "現在の写真を削除",
 "Edit current photo" => "現在の写真を編集",
 "Upload new photo" => "新しい写真をアップロード",
 "Select photo from ownCloud" => "ownCloudから写真を選択",
 "Edit name details" => "名前の詳細を編集",
+"Delete" => "削除",
 "Nickname" => "ニックネーム",
 "Enter nickname" => "ニックネームを入力",
+"Web site" => "ウェブサイト",
+"http://www.somesite.com" => "http://www.somesite.com",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -124,6 +143,7 @@
 "City" => "都市",
 "Region" => "都道府県",
 "Zipcode" => "郵便番号",
+"Postal code" => "郵便番号",
 "Country" => "国名",
 "Addressbook" => "アドレスブック",
 "Miss" => "Miss",
@@ -159,8 +179,12 @@
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
+"Enter name" => "名前を入力",
 "CardDAV syncing addresses" => "CardDAV同期アドレス",
 "more info" => "詳細情報",
 "Primary address (Kontact et al)" => "プライマリアドレス(Kontact 他)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "ダウンロード",
+"Edit" => "編集",
+"New Address Book" => "新規電話帳"
 );
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
index aa51eea79751524da6098ba57dabd20b8ca53d1e..41bcb2d4550edf1b3084ea9d9bbbbbc9182381a3 100644
--- a/apps/contacts/l10n/ko.php
+++ b/apps/contacts/l10n/ko.php
@@ -1,11 +1,13 @@
 <?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." => "최소한 하나의 주소록 항목을 입력해야 합니다.",
 "Trying to add duplicate property: " => "중복 속성 추가 시도: ",
+"Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
+"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
+"Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
 "No ID provided" => "제공되는 아이디 없음",
 "Error setting checksum." => "오류 검사합계 설정",
 "No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다. ",
@@ -33,8 +35,6 @@
 "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를 초과하였다.",
@@ -60,7 +60,6 @@
 "Result: " => "결과:",
 " imported, " => "불러오기,",
 " failed." => "실패.",
-"Addressbook not found." => "주소록을 찾을 수 없습니다.",
 "This is not your addressbook." => "내 주소록이 아닙니다.",
 "Contact could not be found." => "연락처를 찾을 수 없습니다.",
 "Address" => "주소",
@@ -83,12 +82,6 @@
 "Import" => "입력",
 "Addressbooks" => "주소록",
 "Close" => "닫기",
-"Configure Address Books" => "주소록 구성",
-"New Address Book" => "새 주소록",
-"CardDav Link" => "CardDav 링크",
-"Download" => "다운로드",
-"Edit" => "편집",
-"Delete" => "삭제",
 "Drop photo to upload" => "Drop photo to upload",
 "Delete current photo" => "현재 사진 삭제",
 "Edit current photo" => "현재 사진 편집",
@@ -96,6 +89,7 @@
 "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" => "이름 세부사항을 편집합니다. ",
+"Delete" => "삭제",
 "Nickname" => "별명",
 "Enter nickname" => "별명 입력",
 "dd-mm-yyyy" => "일-월-년",
@@ -163,5 +157,8 @@
 "CardDAV syncing addresses" => "CardDAV 주소 동기화",
 "more info" => "더 많은 정보",
 "Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "다운로드",
+"Edit" => "편집",
+"New Address Book" => "새 주소록"
 );
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
index f4a9f7b7dc0e6c25a74ade8b2610a1acaa4b971c..05c7adce66904ff1f2874bc9373ed17c6c807785 100644
--- a/apps/contacts/l10n/lb.php
+++ b/apps/contacts/l10n/lb.php
@@ -1,9 +1,10 @@
 <?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:",
+"Error (de)activating addressbook." => "Fehler beim (de)aktivéieren vum Adressbuch.",
+"Error updating addressbook." => "Fehler beim updaten vum Adressbuch.",
 "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.",
@@ -20,14 +21,12 @@
 "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",
@@ -49,11 +48,6 @@
 "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",
 "Nickname" => "Spëtznumm",
 "Enter nickname" => "Gëff e Spëtznumm an",
@@ -93,5 +87,8 @@
 "Save" => "Späicheren",
 "Submit" => "Fortschécken",
 "Cancel" => "Ofbriechen",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Download",
+"Edit" => "Editéieren",
+"New Address Book" => "Neit Adressbuch"
 );
diff --git a/apps/contacts/l10n/lt_LT.php b/apps/contacts/l10n/lt_LT.php
index db931cea00e4ca29ca6cec0af84760168e720b48..75962e78916c2060ccef8f832450d6b7303b5821 100644
--- a/apps/contacts/l10n/lt_LT.php
+++ b/apps/contacts/l10n/lt_LT.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Klaida (de)aktyvuojant adresų knygą.",
 "There was an error adding the contact." => "Pridedant kontaktą įvyko klaida.",
+"Error (de)activating addressbook." => "Klaida (de)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.",
@@ -14,7 +14,6 @@
 "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",
@@ -34,11 +33,6 @@
 "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",
@@ -56,5 +50,8 @@
 "Displayname" => "Rodomas vardas",
 "Active" => "Aktyvus",
 "Save" => "Išsaugoti",
-"Cancel" => "Atšaukti"
+"Cancel" => "Atšaukti",
+"Download" => "Atsisiųsti",
+"Edit" => "Keisti",
+"New Address Book" => "Nauja adresų knyga"
 );
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index 894d527515a7ade11748f4a2bc67104508e75dff..d2a506f6f694ea61b6acfbb0876dfa693fceb9f0 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
+"Cannot update addressbook with an empty name." => "Неможе да се ажурира адресар со празно име.",
+"Error updating addressbook." => "Грешка при ажурирање на адресарот.",
 "No ID provided" => "Нема доставено ИД",
 "Error setting checksum." => "Грешка во поставување сума за проверка.",
 "No categories selected for deletion." => "Нема избрано категории за бришење.",
@@ -34,8 +36,6 @@
 "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",
@@ -62,7 +62,6 @@
 "Result: " => "Резултат: ",
 " imported, " => "увезено,",
 " failed." => "неуспешно.",
-"Addressbook not found." => "Адресарот не е најден.",
 "This is not your addressbook." => "Ова не е во Вашиот адресар.",
 "Contact could not be found." => "Контактот неможе да биде најден.",
 "Address" => "Адреса",
@@ -85,12 +84,6 @@
 "Import" => "Внеси",
 "Addressbooks" => "Адресари",
 "Close" => "Затвои",
-"Configure Address Books" => "Конфигурирај адресар",
-"New Address Book" => "Нов адресар",
-"CardDav Link" => "Врска за CardDav",
-"Download" => "Преземи",
-"Edit" => "Уреди",
-"Delete" => "Избриши",
 "Drop photo to upload" => "Довлечкај фотографија за да се подигне",
 "Delete current photo" => "Избриши моментална фотографија",
 "Edit current photo" => "Уреди моментална фотографија",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Изберете фотографија од ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка",
 "Edit name details" => "Уреди детали за име",
+"Delete" => "Избриши",
 "Nickname" => "Прекар",
 "Enter nickname" => "Внеси прекар",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Адреса за синхронизација со CardDAV",
 "more info" => "повеќе информации",
 "Primary address (Kontact et al)" => "Примарна адреса",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Преземи",
+"Edit" => "Уреди",
+"New Address Book" => "Нов адресар"
 );
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
index 734668e8692d30003f4d2ed0e70e8b48656ddd09..39af4f6f8a8ec5a6b69a6a43cf2054bac762894e 100644
--- a/apps/contacts/l10n/ms_MY.php
+++ b/apps/contacts/l10n/ms_MY.php
@@ -1,11 +1,13 @@
 <?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.",
 "Trying to add duplicate property: " => "Cuba untuk letak nilai duplikasi:",
+"Error (de)activating addressbook." => "Ralat nyahaktif buku alamat.",
+"Cannot update addressbook with an empty name." => "Tidak boleh kemaskini buku alamat dengan nama yang kosong.",
+"Error updating addressbook." => "Masalah mengemaskini buku alamat.",
 "No ID provided" => "tiada ID diberi",
 "Error setting checksum." => "Ralat menetapkan checksum.",
 "No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
@@ -34,8 +36,6 @@
 "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",
@@ -62,7 +62,6 @@
 "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",
@@ -85,12 +84,6 @@
 "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",
 "Drop photo to upload" => "Letak foto disini untuk muatnaik",
 "Delete current photo" => "Padam foto semasa",
 "Edit current photo" => "Ubah foto semasa",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Padam",
 "Nickname" => "Nama Samaran",
 "Enter nickname" => "Masukkan nama samaran",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "alamat selarian CardDAV",
 "more info" => "maklumat lanjut",
 "Primary address (Kontact et al)" => "Alamat utama",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Muat naik",
+"Edit" => "Sunting",
+"New Address Book" => "Buku Alamat Baru"
 );
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 663909eeeb18007a697e6e2a408ae8157d87d011..0347519f6cd454c6d1aca4649d4520abee2b9172 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -1,9 +1,11 @@
 <?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 (de)activating addressbook." => "Et problem oppsto med å (de)aktivere adresseboken.",
+"Cannot update addressbook with an empty name." => "Kan ikke oppdatere adressebøker uten navn.",
+"Error updating addressbook." => "Et problem oppsto med å oppdatere adresseboken.",
 "No ID provided" => "Ingen ID angitt",
 "No categories selected for deletion." => "Ingen kategorier valgt for sletting.",
 "No address books found." => "Ingen adressebok funnet.",
@@ -25,8 +27,6 @@
 "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",
@@ -47,7 +47,6 @@
 "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.",
 "Address" => "Adresse",
@@ -70,18 +69,13 @@
 "Import" => "Importer",
 "Addressbooks" => "Adressebøker",
 "Close" => "Lukk",
-"Configure Address Books" => "Konfigurer adressebok",
-"New Address Book" => "Ny adressebok",
-"CardDav Link" => "CardDAV-lenke",
-"Download" => "Hent ned",
-"Edit" => "Rediger",
-"Delete" => "Slett",
 "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",
+"Delete" => "Slett",
 "Nickname" => "Kallenavn",
 "Enter nickname" => "Skriv inn kallenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
@@ -142,5 +136,8 @@
 "Configure addressbooks" => "Konfigurer adressebøker",
 "CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
 "more info" => "mer info",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Hent ned",
+"Edit" => "Rediger",
+"New Address Book" => "Ny adressebok"
 );
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index eccd757c240ff43e41ba48c47e0ab340b48e54eb..3e0ad4168a3394c6c5e2415a2815824cc66e8664 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Fout bij het (de)activeren van het adresboek.",
+"Cannot update addressbook with an empty name." => "Kan adresboek zonder naam niet wijzigen",
+"Error updating addressbook." => "Fout bij het updaten van het adresboek.",
 "No ID provided" => "Geen ID opgegeven",
 "Error setting checksum." => "Instellen controlegetal mislukt",
 "No categories selected for deletion." => "Geen categorieën geselecteerd om te verwijderen.",
@@ -27,8 +29,6 @@
 "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. ",
 "Error updating contact property." => "Fout bij het updaten van de contacteigenschap.",
-"Cannot update addressbook with an empty name." => "Kan adresboek zonder naam niet wijzigen",
-"Error updating addressbook." => "Fout bij het updaten van het adresboek.",
 "Error uploading contacts to storage." => "Fout bij opslaan van contacten.",
 "There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Het bestand overschrijdt de upload_max_filesize instelling in php.ini",
@@ -38,7 +38,6 @@
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Contacts" => "Contacten",
 "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.",
 "Address" => "Adres",
@@ -60,12 +59,6 @@
 "Add Contact" => "Contact toevoegen",
 "Import" => "Importeer",
 "Addressbooks" => "Adresboeken",
-"Configure Address Books" => "Instellen adresboeken",
-"New Address Book" => "Nieuw Adresboek",
-"CardDav Link" => "CardDav Link",
-"Download" => "Download",
-"Edit" => "Bewerken",
-"Delete" => "Verwijderen",
 "Drop photo to upload" => "Verwijder foto uit upload",
 "Delete current photo" => "Verwijdere huidige foto",
 "Edit current photo" => "Wijzig huidige foto",
@@ -73,6 +66,7 @@
 "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",
+"Delete" => "Verwijderen",
 "Nickname" => "Roepnaam",
 "Enter nickname" => "Voer roepnaam in",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -125,5 +119,8 @@
 "CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
 "more info" => "meer informatie",
 "Primary address (Kontact et al)" => "Standaardadres",
-"iOS/OS X" => "IOS/OS X"
+"iOS/OS X" => "IOS/OS X",
+"Download" => "Download",
+"Edit" => "Bewerken",
+"New Address Book" => "Nieuw Adresboek"
 );
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
index 53f863ce81ad51ca6017ab15bfffa78b10843982..d56a8957c54a509d24769e0c057f94d26f6b4c22 100644
--- a/apps/contacts/l10n/nn_NO.php
+++ b/apps/contacts/l10n/nn_NO.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
 "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 (de)activating addressbook." => "Ein feil oppstod ved (de)aktivering av adressebok.",
+"Error updating addressbook." => "Eit problem oppstod ved å oppdatere 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.",
@@ -26,10 +26,6 @@
 "Birthday" => "Bursdag",
 "Add Contact" => "Legg til kontakt",
 "Addressbooks" => "Adressebøker",
-"New Address Book" => "Ny adressebok",
-"CardDav Link" => "CardDav lenkje",
-"Download" => "Last ned",
-"Edit" => "Endra",
 "Delete" => "Slett",
 "Preferred" => "Føretrekt",
 "Phone" => "Telefonnummer",
@@ -49,5 +45,8 @@
 "Active" => "Aktiv",
 "Save" => "Lagre",
 "Submit" => "Send",
-"Cancel" => "Kanseller"
+"Cancel" => "Kanseller",
+"Download" => "Last ned",
+"Edit" => "Endra",
+"New Address Book" => "Ny adressebok"
 );
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
index 8e5fe3b44e5cbc130b8a0e8b84181e3693a74627..591ecac8457d5862182e389a23570350a6dafe7a 100644
--- a/apps/contacts/l10n/pl.php
+++ b/apps/contacts/l10n/pl.php
@@ -1,11 +1,15 @@
 <?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.",
+"Could not parse contact: " => "Nie można parsować kontaktu:",
 "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 przy dodawaniu właściwości kontaktu:",
+"Error (de)activating addressbook." => "Błąd (de)aktywowania książki adresowej.",
+"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
+"Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
 "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",
@@ -34,8 +38,6 @@
 "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.",
 "Error updating contact property." => "Błąd uaktualniania elementu.",
-"Cannot update addressbook with an empty name." => "Nie można zaktualizować książki adresowej z pustą nazwą.",
-"Error updating addressbook." => "Błąd uaktualniania książki adresowej.",
 "Error uploading contacts to storage." => "Wystąpił błąd podczas wysyłania kontaktów do magazynu.",
 "There is no error, the file uploaded with success" => "Nie było błędów, plik wyczytano poprawnie.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Załadowany plik przekracza wielkość upload_max_filesize w php.ini ",
@@ -52,6 +54,8 @@
 "Couldn't get a valid address." => "Nie można pobrać prawidłowego adresu.",
 "Error" => "Błąd",
 "Contact" => "Kontakt",
+"New" => "Nowy",
+"New Contact" => "Nowy 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",
@@ -62,7 +66,6 @@
 "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.",
 "Address" => "Adres",
@@ -80,17 +83,32 @@
 "Pager" => "Pager",
 "Internet" => "Internet",
 "Birthday" => "Urodziny",
+"Business" => "Biznesowe",
+"Clients" => "Klienci",
+"Holidays" => "Święta",
+"Ideas" => "Pomysły",
+"Journey" => "Podróż",
+"Meeting" => "Spotkanie",
+"Other" => "Inne",
+"Personal" => "Osobiste",
+"Projects" => "Projekty",
+"Questions" => "Pytania",
 "{name}'s Birthday" => "{name} Urodzony",
 "Add Contact" => "Dodaj kontakt",
 "Import" => "Import",
+"Settings" => "Ustawienia",
 "Addressbooks" => "Książki adresowe",
 "Close" => "Zamknij",
-"Configure Address Books" => "Konfiguruj książkę adresową",
-"New Address Book" => "Nowa książka adresowa",
-"CardDav Link" => "Wyświetla odnośnik CardDav",
-"Download" => "Pobiera książkę adresową",
-"Edit" => "Edytuje książkę adresową",
-"Delete" => "Usuwa książkę adresową",
+"Keyboard shortcuts" => "Skróty klawiatury",
+"Navigation" => "Nawigacja",
+"Next contact in list" => "Następny kontakt na liście",
+"Previous contact in list" => "Poprzedni kontakt na liście",
+"Next/previous addressbook" => "Następna/poprzednia książka adresowa",
+"Actions" => "Akcje",
+"Refresh contacts list" => "Odśwież listę kontaktów",
+"Add new contact" => "Dodaj nowy kontakt",
+"Add new addressbook" => "Dodaj nowa książkę adresową",
+"Delete current contact" => "Usuń obecny kontakt",
 "Drop photo to upload" => "Upuść fotografię aby załadować",
 "Delete current photo" => "Usuń aktualne zdjęcie",
 "Edit current photo" => "Edytuj aktualne zdjęcie",
@@ -98,8 +116,12 @@
 "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",
+"Delete" => "Usuwa książkę adresową",
 "Nickname" => "Nazwa",
 "Enter nickname" => "Wpisz nazwę",
+"Web site" => "Strona www",
+"http://www.somesite.com" => "http://www.jakasstrona.pl",
+"Go to web site" => "Idż do strony www",
 "dd-mm-yyyy" => "dd-mm-rrrr",
 "Groups" => "Grupy",
 "Separate groups with commas" => "Oddziel grupy przecinkami",
@@ -123,10 +145,12 @@
 "Edit address" => "Edytuj adres",
 "Type" => "Typ",
 "PO Box" => "Skrzynka pocztowa",
+"Street and number" => "Ulica i numer",
 "Extended" => "Rozszerzony",
 "City" => "Miasto",
 "Region" => "Region",
 "Zipcode" => "Kod pocztowy",
+"Postal code" => "Kod pocztowy",
 "Country" => "Kraj",
 "Addressbook" => "Książka adresowa",
 "Hon. prefixes" => "Prefiksy Hon.",
@@ -163,8 +187,14 @@
 "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ą",
+"Select Address Books" => "Wybierz książki adresowe",
+"Enter name" => "Wpisz nazwę",
+"Enter description" => "Wprowadź opis",
 "CardDAV syncing addresses" => "adres do synchronizacji CardDAV",
 "more info" => "więcej informacji",
 "Primary address (Kontact et al)" => "Pierwszy adres",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Pobiera książkę adresową",
+"Edit" => "Edytuje książkę adresową",
+"New Address Book" => "Nowa książka adresowa"
 );
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
index 45ae8206df17225b8605b63e0d532466dcfc4782..ac02cf6eff22a69247bfe9af925cd30f21204f9a 100644
--- a/apps/contacts/l10n/pt_BR.php
+++ b/apps/contacts/l10n/pt_BR.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Erro ao (des)ativar agenda.",
+"Cannot update addressbook with an empty name." => "Não é possível atualizar sua agenda com um nome em branco.",
+"Error updating addressbook." => "Erro ao atualizar agenda.",
 "No ID provided" => "Nenhum ID fornecido",
 "Error setting checksum." => "Erro ajustando checksum.",
 "No categories selected for deletion." => "Nenhum categoria selecionada para remoção.",
@@ -34,8 +36,6 @@
 "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. ",
 "Error updating contact property." => "Erro ao atualizar propriedades do contato.",
-"Cannot update addressbook with an empty name." => "Não é possível atualizar sua agenda com um nome em branco.",
-"Error updating addressbook." => "Erro ao atualizar agenda.",
 "Error uploading contacts to storage." => "Erro enviando contatos para armazenamento.",
 "There is no error, the file uploaded with success" => "Arquivo enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O arquivo enviado excede a diretiva upload_max_filesize em php.ini",
@@ -62,7 +62,6 @@
 "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.",
 "Address" => "Endereço",
@@ -85,12 +84,6 @@
 "Import" => "Importar",
 "Addressbooks" => "Agendas de Endereço",
 "Close" => "Fechar.",
-"Configure Address Books" => "Configurar Livro de Endereços",
-"New Address Book" => "Nova agenda",
-"CardDav Link" => "Link CardDav",
-"Download" => "Baixar",
-"Edit" => "Editar",
-"Delete" => "Excluir",
 "Drop photo to upload" => "Arraste a foto para ser carregada",
 "Delete current photo" => "Deletar imagem atual",
 "Edit current photo" => "Editar imagem atual",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Excluir",
 "Nickname" => "Apelido",
 "Enter nickname" => "Digite o apelido",
 "dd-mm-yyyy" => "dd-mm-aaaa",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "Sincronizando endereços CardDAV",
 "more info" => "leia mais",
 "Primary address (Kontact et al)" => "Endereço primário(Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"New Address Book" => "Nova agenda"
 );
diff --git a/apps/contacts/l10n/pt_PT.php b/apps/contacts/l10n/pt_PT.php
index 380320216c7b6b0a6b4a0b87f82ce09c59dddda4..1042a15e3ddeadac79515abf6cf66761f001a7f1 100644
--- a/apps/contacts/l10n/pt_PT.php
+++ b/apps/contacts/l10n/pt_PT.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Erro a (des)ativar o livro de endereços",
+"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
+"Error updating addressbook." => "Erro a atualizar o livro de endereços",
 "No ID provided" => "Nenhum ID inserido",
 "Error setting checksum." => "Erro a definir checksum.",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para eliminar.",
@@ -34,8 +36,6 @@
 "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. ",
 "Error updating contact property." => "Erro ao atualizar propriedade do contato",
-"Cannot update addressbook with an empty name." => "Não é possivel actualizar o livro de endereços com o nome vazio.",
-"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",
@@ -62,7 +62,6 @@
 "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",
 "Address" => "Morada",
@@ -85,12 +84,6 @@
 "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",
-"CardDav Link" => "Endereço CardDav",
-"Download" => "Transferir",
-"Edit" => "Editar",
-"Delete" => "Apagar",
 "Drop photo to upload" => "Arraste e solte fotos para carregar",
 "Delete current photo" => "Eliminar a foto actual",
 "Edit current photo" => "Editar a foto actual",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Apagar",
 "Nickname" => "Alcunha",
 "Enter nickname" => "Introduza alcunha",
 "dd-mm-yyyy" => "dd-mm-aaaa",
@@ -166,5 +160,8 @@
 "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"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Transferir",
+"Edit" => "Editar",
+"New Address Book" => "Novo livro de endereços"
 );
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
index 9972d0b66af26ab649e59ea108fcb28be20e4654..ab4cc730061370d9a7d166cee40681db44756420 100644
--- a/apps/contacts/l10n/ro.php
+++ b/apps/contacts/l10n/ro.php
@@ -1,10 +1,11 @@
 <?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 (de)activating addressbook." => "(Dez)activarea agendei a întâmpinat o eroare.",
+"Error updating addressbook." => "Eroare la actualizarea agendei.",
 "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",
@@ -24,7 +25,6 @@
 "Error loading image." => "Eroare la încărcarea imaginii.",
 "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ă.",
@@ -47,12 +47,8 @@
 "{name}'s Birthday" => "Ziua de naștere a {name}",
 "Add Contact" => "Adaugă contact",
 "Addressbooks" => "Agende",
-"New Address Book" => "Agendă nouă",
-"CardDav Link" => "Legătură CardDev",
-"Download" => "Descarcă",
-"Edit" => "Editează",
-"Delete" => "Șterge",
 "Edit name details" => "Introdu detalii despre nume",
+"Delete" => "Șterge",
 "Nickname" => "Pseudonim",
 "Enter nickname" => "Introdu pseudonim",
 "dd-mm-yyyy" => "zz-ll-aaaa",
@@ -81,5 +77,8 @@
 "Active" => "Activ",
 "Save" => "Salvează",
 "Submit" => "Trimite",
-"Cancel" => "Anulează"
+"Cancel" => "Anulează",
+"Download" => "Descarcă",
+"Edit" => "Editează",
+"New Address Book" => "Agendă nouă"
 );
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 63217baf32d05208f2d58b9706d3b9219647f89c..b598b6c11d55f8f9caaa64b651cdd7c328b2df83 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
+"Cannot update addressbook with an empty name." => "Нельзя обновить адресную книгу с пустым именем.",
+"Error updating addressbook." => "Ошибка обновления адресной книги.",
 "No ID provided" => "ID не предоставлен",
 "Error setting checksum." => "Ошибка установки контрольной суммы.",
 "No categories selected for deletion." => "Категории для удаления не установлены.",
@@ -34,8 +36,6 @@
 "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." => "Ошибка обновления адресной книги.",
 "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",
@@ -62,7 +62,6 @@
 "Result: " => "Результат:",
 " imported, " => "импортировано, ",
 " failed." => "не удалось.",
-"Addressbook not found." => "Адресная книга не найдена.",
 "This is not your addressbook." => "Это не ваша адресная книга.",
 "Contact could not be found." => "Контакт не найден.",
 "Address" => "Адрес",
@@ -85,12 +84,6 @@
 "Import" => "Импорт",
 "Addressbooks" => "Адресные книги",
 "Close" => "Закрыть",
-"Configure Address Books" => "Настроить Адресную книгу",
-"New Address Book" => "Новая адресная книга",
-"CardDav Link" => "Ссылка CardDAV",
-"Download" => "Скачать",
-"Edit" => "Редактировать",
-"Delete" => "Удалить",
 "Drop photo to upload" => "Перетяните фотографии для загрузки",
 "Delete current photo" => "Удалить текущую фотографию",
 "Edit current photo" => "Редактировать текущую фотографию",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Формат Краткое имя, Полное имя",
 "Edit name details" => "Изменить детали имени",
+"Delete" => "Удалить",
 "Nickname" => "Псевдоним",
 "Enter nickname" => "Введите псевдоним",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV синхронизации адресов",
 "more info" => "дополнительная информация",
 "Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Скачать",
+"Edit" => "Редактировать",
+"New Address Book" => "Новая адресная книга"
 );
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 79db2dbcf6e5db152af1ea6627322b0e126c4fe6..cf85f4cf3e731e6b6f83dde234492b206d7217e4 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
 "There was an error adding the contact." => "Vyskytla sa chyba pri pridávaní kontaktu.",
 "element name is not set." => "meno elementu nie je nastavené.",
 "id is not set." => "ID nie je nastavené.",
 "Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
 "At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
 "Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
+"Error (de)activating addressbook." => "Chyba (de)aktivácie adresára.",
+"Cannot update addressbook with an empty name." => "Nedá sa upraviť adresár s prázdnym menom.",
+"Error updating addressbook." => "Chyba aktualizácie adresára.",
 "No ID provided" => "ID nezadané",
 "Error setting checksum." => "Chyba pri nastavovaní kontrolného súčtu.",
 "No categories selected for deletion." => "Žiadne kategórie neboli vybraté na odstránenie.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informácia o vCard je nesprávna. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Niečo sa pokazilo.",
 "Error updating contact property." => "Chyba aktualizovania údaju kontaktu.",
-"Cannot update addressbook with an empty name." => "Nedá sa upraviť adresár s prázdnym menom.",
-"Error updating addressbook." => "Chyba aktualizácie adresára.",
 "Error uploading contacts to storage." => "Chyba pri ukladaní kontaktov na úložisko.",
 "There is no error, the file uploaded with success" => "Nevyskytla sa žiadna chyba, súbor úspešne uložené.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Ukladaný súbor prekračuje nastavenie upload_max_filesize v php.ini",
@@ -64,7 +64,6 @@
 "Result: " => "Výsledok: ",
 " imported, " => " importovaných, ",
 " failed." => " zlyhaných.",
-"Addressbook not found." => "Adresár sa nenašiel.",
 "This is not your addressbook." => "Toto nie je váš adresár.",
 "Contact could not be found." => "Kontakt nebol nájdený.",
 "Address" => "Adresa",
@@ -104,12 +103,6 @@
 "Add new contact" => "Pridaj nový kontakt",
 "Add new addressbook" => "Pridaj nový adresár",
 "Delete current contact" => "Vymaž súčasný kontakt",
-"Configure Address Books" => "Nastaviť adresáre",
-"New Address Book" => "Nový adresár",
-"CardDav Link" => "CardDav odkaz",
-"Download" => "Stiahnuť",
-"Edit" => "Upraviť",
-"Delete" => "Odstrániť",
 "Drop photo to upload" => "Pretiahnite sem fotku pre nahratie",
 "Delete current photo" => "Odstrániť súčasnú fotku",
 "Edit current photo" => "Upraviť súčasnú fotku",
@@ -117,6 +110,7 @@
 "Select photo from ownCloud" => "Vybrať fotku z ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami",
 "Edit name details" => "Upraviť podrobnosti mena",
+"Delete" => "Odstrániť",
 "Nickname" => "Prezývka",
 "Enter nickname" => "Zadajte prezývku",
 "dd-mm-yyyy" => "dd. mm. yyyy",
@@ -189,5 +183,8 @@
 "CardDAV syncing addresses" => "Adresy pre synchronizáciu s CardDAV",
 "more info" => "viac informácií",
 "Primary address (Kontact et al)" => "Predvolená adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Stiahnuť",
+"Edit" => "Upraviť",
+"New Address Book" => "Nový adresár"
 );
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index 7ff30a34f14adc5cb79f5cd05a5b90cd2acd765d..73d919cf0ab7398ddde61195ff68985a0f34e7c5 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "Napaka med (de)aktivacijo imenika.",
+"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
+"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
 "No ID provided" => "ID ni bil podan",
 "Error setting checksum." => "Napaka pri nastavljanju nadzorne vsote.",
 "No categories selected for deletion." => "Nobena kategorija ni bila izbrana za izbris.",
@@ -34,8 +36,6 @@
 "Information about vCard is incorrect. Please reload the page: " => "Informacija o vCard je napačna. Prosimo, če ponovno naložite stran: ",
 "Something went FUBAR. " => "Nekaj je šlo v franže. ",
 "Error updating contact property." => "Napaka pri posodabljanju lastnosti stika.",
-"Cannot update addressbook with an empty name." => "Ne morem posodobiti imenika s praznim imenom.",
-"Error updating addressbook." => "Napaka pri posodabljanju imenika.",
 "Error uploading contacts to storage." => "Napaka pri nalaganju stikov v hrambo.",
 "There is no error, the file uploaded with success" => "Datoteka je bila uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini",
@@ -62,7 +62,6 @@
 "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.",
 "Address" => "Naslov",
@@ -85,12 +84,6 @@
 "Import" => "Uvozi",
 "Addressbooks" => "Imeniki",
 "Close" => "Zapri",
-"Configure Address Books" => "Nastavi imenike",
-"New Address Book" => "Nov imenik",
-"CardDav Link" => "CardDav povezava",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"Delete" => "Izbriši",
 "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",
@@ -98,6 +91,7 @@
 "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",
+"Delete" => "Izbriši",
 "Nickname" => "Vzdevek",
 "Enter nickname" => "Vnesite vzdevek",
 "dd-mm-yyyy" => "dd. mm. yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV naslovi za sinhronizacijo",
 "more info" => "več informacij",
 "Primary address (Kontact et al)" => "Primarni naslov (za kontakt et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Prenesi",
+"Edit" => "Uredi",
+"New Address Book" => "Nov imenik"
 );
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index 3db20c55b893133a42c2f1d214c7e02e1ac4dec1..77c86a9d9349c2c01ed95b7adc9a2de18d7ac676 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -19,9 +19,6 @@
 "Birthday" => "Рођендан",
 "Add Contact" => "Додај контакт",
 "Addressbooks" => "Адресар",
-"New Address Book" => "Нови адресар",
-"Download" => "Преузимање",
-"Edit" => "Уреди",
 "Delete" => "Обриши",
 "Preferred" => "Пожељан",
 "Phone" => "Телефон",
@@ -41,5 +38,8 @@
 "Active" => "Активан",
 "Save" => "Сними",
 "Submit" => "Пошаљи",
-"Cancel" => "Откажи"
+"Cancel" => "Откажи",
+"Download" => "Преузимање",
+"Edit" => "Уреди",
+"New Address Book" => "Нови адресар"
 );
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
index 6238b2385b691c7ba6066d6370d4255d9ecb6035..3d0c0d2b8fc4d8c8d3ef20b69d05fa0afcc849f2 100644
--- a/apps/contacts/l10n/sr@latin.php
+++ b/apps/contacts/l10n/sr@latin.php
@@ -16,7 +16,6 @@
 "Pager" => "Pejdžer",
 "Birthday" => "Rođendan",
 "Add Contact" => "Dodaj kontakt",
-"Edit" => "Uredi",
 "Delete" => "Obriši",
 "Phone" => "Telefon",
 "PO Box" => "Poštanski broj",
@@ -24,5 +23,6 @@
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Zip kod",
-"Country" => "Zemlja"
+"Country" => "Zemlja",
+"Edit" => "Uredi"
 );
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index bb8f0d0a3003783d31c4c04fe62a2adf566b23b5..1795a45c099114d99ca14a0362090e2c662518d5 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
 "There was an error adding the contact." => "Det uppstod ett fel när kontakt skulle läggas till",
 "id is not set." => "ID är inte satt.",
 "Could not parse contact: " => "Kunde inte läsa kontakt:",
 "Cannot add empty property." => "Kan inte lägga till en tom egenskap",
 "At least one of the address fields has to be filled out." => "Minst ett fält måste fyllas i",
 "Error adding contact property: " => "Kunde inte lägga till egenskap för kontakt:",
+"Error (de)activating addressbook." => "Fel när (av)aktivera adressbok",
+"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
+"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
 "No ID provided" => "Inget ID angett",
 "Error setting checksum." => "Fel uppstod när kontrollsumma skulle sättas.",
 "No categories selected for deletion." => "Inga kategorier valda för borttaging",
@@ -30,8 +32,6 @@
 "checksum is not set." => "kontrollsumma är inte satt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om vCard är fel. Ladda om sidan:",
 "Error updating contact property." => "Fel uppstod när kontaktegenskap skulle uppdateras",
-"Cannot update addressbook with an empty name." => "Kan inte uppdatera adressboken med ett tomt namn.",
-"Error updating addressbook." => "Fel uppstod när adressbok skulle uppdateras",
 "Error uploading contacts to storage." => "Fel uppstod när kontakt skulle lagras.",
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
@@ -60,7 +60,6 @@
 "Result: " => "Resultat:",
 " imported, " => "importerad,",
 " failed." => "misslyckades.",
-"Addressbook not found." => "Hittade inte adressboken",
 "This is not your addressbook." => "Det här är inte din adressbok.",
 "Contact could not be found." => "Kontakt kunde inte hittas.",
 "Address" => "Adress",
@@ -89,12 +88,6 @@
 "Import" => "Importera",
 "Addressbooks" => "Adressböcker",
 "Close" => "Stäng",
-"Configure Address Books" => "Konfigurera adressböcker",
-"New Address Book" => "Ny adressbok",
-"CardDav Link" => "CardDAV länk",
-"Download" => "Nedladdning",
-"Edit" => "Redigera",
-"Delete" => "Radera",
 "Drop photo to upload" => "Släpp foto för att ladda upp",
 "Delete current photo" => "Ta bort aktuellt foto",
 "Edit current photo" => "Redigera aktuellt foto",
@@ -102,6 +95,7 @@
 "Select photo from ownCloud" => "Välj foto från ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => " anpassad, korta namn, hela namn, bakåt eller bakåt med komma",
 "Edit name details" => "Redigera detaljer för namn",
+"Delete" => "Radera",
 "Nickname" => "Smeknamn",
 "Enter nickname" => "Ange smeknamn",
 "dd-mm-yyyy" => "dd-mm-åååå",
@@ -160,5 +154,8 @@
 "CardDAV syncing addresses" => "CardDAV synkningsadresser",
 "more info" => "mera information",
 "Primary address (Kontact et al)" => "Primär adress (Kontakt o.a.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Nedladdning",
+"Edit" => "Redigera",
+"New Address Book" => "Ny adressbok"
 );
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index d7af2ae13f9fb863a6c603a7a4058070760a9e4f..e33d238b94f18a72474a87befc2c5ab14c1d9a53 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
+"Cannot update addressbook with an empty name." => "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
+"Error updating addressbook." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
 "No ID provided" => "ยังไม่ได้ใส่รหัส",
 "Error setting checksum." => "เกิดข้อผิดพลาดในการตั้งค่า checksum",
 "No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
@@ -34,8 +36,6 @@
 "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." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
 "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",
@@ -62,7 +62,6 @@
 "Result: " => "ผลลัพธ์: ",
 " imported, " => " นำเข้าข้อมูลแล้ว, ",
 " failed." => " ล้มเหลว.",
-"Addressbook not found." => "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ",
 "This is not your addressbook." => "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ",
 "Contact could not be found." => "ไม่พบข้อมูลการติดต่อ",
 "Address" => "ที่อยู่",
@@ -85,12 +84,6 @@
 "Import" => "นำเข้า",
 "Addressbooks" => "สมุดบันทึกที่อยู่",
 "Close" => "ปิด",
-"Configure Address Books" => "กำหนดค่าสมุดบันทึกที่อยู่",
-"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
-"CardDav Link" => "ลิงค์ CardDav",
-"Download" => "ดาวน์โหลด",
-"Edit" => "แก้ไข",
-"Delete" => "ลบ",
 "Drop photo to upload" => "วางรูปภาพที่ต้องการอัพโหลด",
 "Delete current photo" => "ลบรูปภาพปัจจุบัน",
 "Edit current photo" => "แก้ไขรูปภาพปัจจุบัน",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง",
 "Edit name details" => "แก้ไขรายละเอียดของชื่อ",
+"Delete" => "ลบ",
 "Nickname" => "ชื่อเล่น",
 "Enter nickname" => "กรอกชื่อเล่น",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "ที่อยู่ที่ใช้เชื่อมข้อมูลกับ CardDAV",
 "more info" => "ข้อมูลเพิ่มเติม",
 "Primary address (Kontact et al)" => "ที่อยู่หลัก (สำหรับติดต่อ)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "ดาวน์โหลด",
+"Edit" => "แก้ไข",
+"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
 );
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index e10d36753cd395adeca58674f53450c848c90b29..2cbe15cef93f580f74a0ac710bba009f00f4943a 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -1,5 +1,4 @@
 <?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ış.",
@@ -8,6 +7,9 @@
 "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 (de)activating addressbook." => "Adres defteri etkisizleştirilirken hata oluştu.",
+"Cannot update addressbook with an empty name." => "Adres defterini boş bir isimle güncelleyemezsiniz.",
+"Error updating addressbook." => "Adres defteri güncellenirken 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.",
@@ -36,8 +38,6 @@
 "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.",
 "Error updating contact property." => "Kişi özelliği güncellenirken hata oluştu.",
-"Cannot update addressbook with an empty name." => "Adres defterini boş bir isimle güncelleyemezsiniz.",
-"Error updating addressbook." => "Adres defteri güncellenirken hata oluştu.",
 "Error uploading contacts to storage." => "Bağlantıları depoya yükleme hatası",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Dosyanın boyutu php.ini dosyasındaki upload_max_filesize limitini aşıyor",
@@ -66,7 +66,6 @@
 "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ı.",
 "Address" => "Adres",
@@ -113,12 +112,6 @@
 "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",
-"CardDav Link" => "CardDav Bağlantısı",
-"Download" => "İndir",
-"Edit" => "Düzenle",
-"Delete" => "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",
@@ -126,6 +119,7 @@
 "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",
+"Delete" => "Sil",
 "Nickname" => "Takma ad",
 "Enter nickname" => "Takma adı girin",
 "Web site" => "Web sitesi",
@@ -206,5 +200,7 @@
 "more info" => "daha fazla bilgi",
 "Primary address (Kontact et al)" => "Birincil adres (Bağlantı ve arkadaşları)",
 "iOS/OS X" => "iOS/OS X",
-"Read only vCard directory link(s)" => "Sadece okunabilir vCard dizin link(ler)i"
+"Download" => "İndir",
+"Edit" => "Düzenle",
+"New Address Book" => "Yeni Adres Defteri"
 );
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
index 5959f1ff7e2b9b31463443b6b68bea59b6172d14..027895690db8f36bbf192c7a718c5bd1cc0edf39 100644
--- a/apps/contacts/l10n/uk.php
+++ b/apps/contacts/l10n/uk.php
@@ -13,8 +13,6 @@
 "Pager" => "Пейджер",
 "Birthday" => "День народження",
 "Add Contact" => "Додати контакт",
-"New Address Book" => "Нова адресна книга",
-"Download" => "Завантажити",
 "Delete" => "Видалити",
 "Phone" => "Телефон",
 "Delete contact" => "Видалити контакт",
@@ -22,5 +20,7 @@
 "City" => "Місто",
 "Zipcode" => "Поштовий індекс",
 "Country" => "Країна",
-"Displayname" => "Відображуване ім'я"
+"Displayname" => "Відображуване ім'я",
+"Download" => "Завантажити",
+"New Address Book" => "Нова адресна книга"
 );
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
index 5713ede7b0084e01046901b7fbd356ef5155328c..060ca079fa744eb1c57c305b02d54b2bad49323d 100644
--- a/apps/contacts/l10n/vi.php
+++ b/apps/contacts/l10n/vi.php
@@ -26,9 +26,6 @@
 "Birthday" => "Ngày sinh nhật",
 "Add Contact" => "Thêm liên lạc",
 "Addressbooks" => "Sổ địa chỉ",
-"CardDav Link" => "CardDav Link",
-"Download" => "Tải về",
-"Edit" => "Sửa",
 "Delete" => "Xóa",
 "Phone" => "Điện thoại",
 "Delete contact" => "Xóa liên lạc",
@@ -44,5 +41,7 @@
 "Active" => "Kích hoạt",
 "Save" => "Lưu",
 "Submit" => "Submit",
-"Cancel" => "Hủy"
+"Cancel" => "Hủy",
+"Download" => "Tải về",
+"Edit" => "Sửa"
 );
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
index affc75e3dfe633570c3eaa1462a7bea26b5c1a87..b996095d26c05301626d9d71c89df64f6dfb4ed6 100644
--- a/apps/contacts/l10n/zh_CN.php
+++ b/apps/contacts/l10n/zh_CN.php
@@ -1,11 +1,13 @@
 <?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 (de)activating addressbook." => "(取消)激活地址簿错误。",
+"Cannot update addressbook with an empty name." => "无法使用一个空名称更新地址簿",
+"Error updating addressbook." => "更新地址簿错误",
 "No ID provided" => "未提供 ID",
 "Error setting checksum." => "设置校验值错误。",
 "No categories selected for deletion." => "未选中要删除的分类。",
@@ -34,8 +36,6 @@
 "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 的限制",
@@ -62,7 +62,6 @@
 "Result: " => "结果: ",
 " imported, " => " 已导入, ",
 " failed." => " 失败。",
-"Addressbook not found." => "未找到地址簿。",
 "This is not your addressbook." => "这不是您的地址簿。",
 "Contact could not be found." => "无法找到联系人。",
 "Address" => "地址",
@@ -85,12 +84,6 @@
 "Import" => "导入",
 "Addressbooks" => "地址簿",
 "Close" => "关闭",
-"Configure Address Books" => "配置地址簿",
-"New Address Book" => "新建地址簿",
-"CardDav Link" => "CardDav 链接",
-"Download" => "下载",
-"Edit" => "编辑",
-"Delete" => "删除",
 "Drop photo to upload" => "拖拽图片进行上传",
 "Delete current photo" => "删除当前照片",
 "Edit current photo" => "编辑当前照片",
@@ -98,6 +91,7 @@
 "Select photo from ownCloud" => "从 ownCloud 选择照片",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "自定义格式,简称,全名,姓在前,姓在前并用逗号分割",
 "Edit name details" => "编辑名称详情",
+"Delete" => "删除",
 "Nickname" => "昵称",
 "Enter nickname" => "输入昵称",
 "dd-mm-yyyy" => "yyyy-mm-dd",
@@ -166,5 +160,8 @@
 "CardDAV syncing addresses" => "CardDAV 同步地址",
 "more info" => "更多信息",
 "Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "下载",
+"Edit" => "编辑",
+"New Address Book" => "新建地址簿"
 );
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index 5647c6bcaa4b34045e7d2533f96594df505b8baa..4751c22f1d70a696f9d7b01c55356869903376c3 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -1,19 +1,18 @@
 <?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
 "There was an error adding the contact." => "添加通訊錄發生錯誤",
 "Cannot add empty property." => "不可添加空白內容",
 "At least one of the address fields has to be filled out." => "至少必須填寫一欄地址",
+"Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
+"Error updating addressbook." => "電話簿更新中發生錯誤",
 "No ID provided" => "未提供 ID",
 "No contacts found." => "沒有找到聯絡人",
 "Missing ID" => "遺失ID",
 "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." => "通訊錄未發現",
 "Address" => "地址",
@@ -34,13 +33,8 @@
 "{name}'s Birthday" => "{name}的生日",
 "Add Contact" => "添加通訊錄",
 "Addressbooks" => "電話簿",
-"Configure Address Books" => "設定通訊錄",
-"New Address Book" => "新電話簿",
-"CardDav Link" => "CardDav 聯結",
-"Download" => "下載",
-"Edit" => "編輯",
-"Delete" => "刪除",
 "Edit name details" => "編輯姓名詳細資訊",
+"Delete" => "刪除",
 "Nickname" => "綽號",
 "Enter nickname" => "輸入綽號",
 "dd-mm-yyyy" => "dd-mm-yyyy",
@@ -82,5 +76,8 @@
 "Active" => "作用中",
 "Save" => "儲存",
 "Submit" => "提出",
-"Cancel" => "取消"
+"Cancel" => "取消",
+"Download" => "下載",
+"Edit" => "編輯",
+"New Address Book" => "新電話簿"
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 6ee626a727f2df8c7803864d4af96125b51ec859..1c0bf94ca71b03d46e9390f7b2ce88000ee5e2b3 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -4,7 +4,6 @@
 "This category already exists: " => "Questa categoria esiste già: ",
 "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",
-"Error loading script for the settings" => "Errore di caricamento dello script per le impostazioni",
 "January" => "Gennaio",
 "February" => "Febbraio",
 "March" => "Marzo",
diff --git a/l10n/af/contacts.po b/l10n/af/contacts.po
index 2333c2fb296b945da8ac51a6ee05aa46244281d4..91dc79117607c3779b788c176c71b8a03491bd9c 100644
--- a/l10n/af/contacts.po
+++ b/l10n/af/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: af\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 527198ed85c8d441a1b911d1d7554a93e71d2a79..88fb86a58a59dbf621c061589c59e4ae3e55ebbd 100644
--- a/l10n/af/core.po
+++ b/l10n/af/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 59aa93b425a22963d22979aa06d44dba169c6ed7..3b7b6ab272a355080f9705e8c8216529576e0e55 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ar/contacts.po b/l10n/ar/contacts.po
index 2c712f76921a0ff8dbcbc49ebbdfea12f5ef268d..88a96f503f6579a7f2a15686dff11417cd80c86d 100644
--- a/l10n/ar/contacts.po
+++ b/l10n/ar/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: 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 "خطء خلال اضافة معرفه جديده."
@@ -30,7 +26,9 @@ msgstr "خطء خلال اضافة معرفه جديده."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "خطء خلال توقيف كتاب العناوين."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "خطء خلال تعديل كتاب العناوين"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 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 ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "المعارف"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "معرفه"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "هذا ليس دفتر عناوينك."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "لم يتم العثور على الشخص."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "عنوان"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "الهاتف"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "البريد الالكتروني"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "المؤسسة"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "الوظيفة"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "البيت"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "معلومات إضافية"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "صوت"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "الفاكس"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "الفيديو"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "الرنان"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "تاريخ الميلاد"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "كتب العناوين"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "وصلة CardDav"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "حذف"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "مفضل"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "الهاتف"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "انزال المعرفه"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "امحي المعرفه"
 
@@ -799,7 +790,7 @@ msgstr "الاسم المعروض"
 msgid "Active"
 msgstr "فعال"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "حفظ"
 
@@ -807,7 +798,7 @@ msgstr "حفظ"
 msgid "Submit"
 msgstr "ارسال"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "انزال"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "تعديل"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "كتاب عناوين جديد"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 40dbd4406903179095e545dd16b7f72448f646d3..a4cc8c065a371e4228a933408b4554077bab1023 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index cb1df6d27592062430c995d8493b91f9f19ebf9f..ec5ea4044778773ec3f0c7a61d26c839d815aa24 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "حصه"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "حذف"
diff --git a/l10n/ar_SA/contacts.po b/l10n/ar_SA/contacts.po
index 555fd8a481f8544ccbead68b09a8ce126a2951d4..4b0078ce6fea5a4a2585ceb1001c071fc72a747f 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: ar_SA\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 367bc89fa5715504140746d236d8970744d7cfe1..7f31f831b3de2dda5a05f57c29390b2d341cf93b 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index f6e11e306c6ebdc3fbbc67097bf373126abcffc7..97403dbc3c99ea45e360b9c85b2ff16783385e07 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/bg_BG/contacts.po b/l10n/bg_BG/contacts.po
index d3511531840cbacca29e2d66d36f009ded704f47..1e67535533400b08c3d848db7a671c543070fed8 100644
--- a/l10n/bg_BG/contacts.po
+++ b/l10n/bg_BG/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: bg_BG\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 96d5aeb2168fb3989601a76b24a9f58c48538e22..5cb2d7ef8a707a2a7d67b20a25c48c25c3c141d9 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Януари"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 00bd674afae2ca6300a84fde810e95915954563c..ef69b440c90e5e30cd77cea31b55fca9a0ece2a3 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:43+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "Квота по подразбиране"
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Изтриване"
diff --git a/l10n/ca/contacts.po b/l10n/ca/contacts.po
index f73ac255105705dec86fa7bbd3eacfe7e5d41410..b82f58e89669afea5173a3e616eb40537031f51d 100644
--- a/l10n/ca/contacts.po
+++ b/l10n/ca/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Error en (des)activar la llibreta d'adreces."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "S'ha produït un error en afegir el contacte."
@@ -31,7 +27,9 @@ msgstr "S'ha produït un error en afegir el contacte."
 msgid "element name is not set."
 msgstr "no s'ha establert el nom de l'element."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "no s'ha establert la id."
 
@@ -55,6 +53,18 @@ msgstr "Esteu intentant afegir una propietat duplicada:"
 msgid "Error adding contact property: "
 msgstr "Error en afegir la propietat del contacte:"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Error en (des)activar la llibreta d'adreces."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Error en actualitzar la llibreta d'adreces."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No heu facilitat cap ID"
@@ -168,14 +178,6 @@ msgstr "Alguna cosa ha anat FUBAR."
 msgid "Error updating contact property."
 msgstr "Error en actualitzar la propietat del contacte."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "No es pot actualitzar la llibreta d'adreces amb un nom buit"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Error en actualitzar la llibreta d'adreces."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error en carregar contactes a l'emmagatzemament."
@@ -222,71 +224,78 @@ msgstr "No s'ha carregat cap fitxer. Error desconegut"
 msgid "Contacts"
 msgstr "Contactes"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Aquesta funcionalitat encara no està implementada"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "No implementada"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "No s'ha pogut obtenir una adreça vàlida."
 
-#: 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Error"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacte"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nou"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Contate nou"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Aquesta propietat no pot ser buida."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "No s'han pogut serialitzar els elements."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 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:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Edita el nom"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "No s'han seleccionat fitxers per a la pujada."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleccioneu un tipus"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat: "
@@ -299,129 +308,133 @@ msgstr " importat, "
 msgid " failed."
 msgstr " fallada."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "No s'ha trobat la llibreta d'adreces."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Aquesta no és la vostra llibreta d'adreces"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "No s'ha trobat el contacte."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adreça"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organització"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Feina"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Veu"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Paginador"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Negocis"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Trucada"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Emissari"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idees"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Viatge"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Aniversari"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Reunió"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Altres"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Personal"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projectes"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Preguntes"
 
@@ -439,209 +452,187 @@ msgstr "Importa"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Configuració"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Tanca"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navegació"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Següent contacte de la llista"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Contacte anterior de la llista"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Expandeix/col·lapsa la llibreta d'adreces"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Següent/anterior llibreta d'adreces"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Carrega de nou la llista de contactes"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Afegeix un contacte nou"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Esborra el contacte"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configura les llibretes d'adreces"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova llibreta d'adreces"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Enllaç CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Baixa"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Edita"
-
-#: 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 "Suprimeix"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Elimina la foto a carregar"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Elimina la foto actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Edita la foto actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Carrega una foto nova"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecciona una foto de ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Edita detalls del nom"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Escriviu el sobrenom"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Adreça web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Vés a la web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separeu els grups amb comes"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Edita els grups"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferit"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Especifiqueu una adreça de correu electrònic correcta"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Escriviu una adreça de correu electrònic"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Envia per correu electrònic a l'adreça"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Elimina l'adreça de correu electrònic"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Escriviu el número de telèfon"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Elimina el número de telèfon"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visualitza al mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Edita els detalls de l'adreça"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Afegiu notes aquí."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Afegeix un camp"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telèfon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Baixa el contacte"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Suprimeix el contacte"
 
@@ -800,7 +791,7 @@ msgstr "Nom a mostrar"
 msgid "Active"
 msgstr "Actiu"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Desa"
 
@@ -808,7 +799,7 @@ msgstr "Desa"
 msgid "Submit"
 msgstr "Envia"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -832,15 +823,15 @@ msgstr "Nom de la nova llibreta d'adreces"
 msgid "Importing contacts"
 msgstr "S'estan important contactes"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "No teniu contactes a la llibreta d'adreces."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Afegeix un contacte"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configura les llibretes d'adreces"
 
@@ -872,6 +863,34 @@ msgstr "Adreça primària (Kontact i al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Enllaç(os) vCard només de lectura"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Baixa"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Edita"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova llibreta d'adreces"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 65b3ff158342e8644a39204b51eadec22069a69b..4d26bb008c554ea923cf12e3dae7c6d166621b1c 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Gener"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 43be7c44b6a7a621f0ceb23e20c2eeba4326b2ec..63756ed863b3b59243bc99a110c404e33742ccaf 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 06:08+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Quota per defecte"
 msgid "Other"
 msgstr "Altre"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -211,10 +211,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin per a ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index 2b16024e2be50c8b2d0a6fc891795d484dbd6b0c..c59ae23b7be62753472a334251757af99ff63cfe 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Chyba při (de)aktivaci adresáře."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Během přidávání kontaktu nastala chyba."
@@ -32,7 +28,9 @@ msgstr "Během přidávání kontaktu nastala chyba."
 msgid "element name is not set."
 msgstr "jméno elementu není nastaveno."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id neni nastaveno."
 
@@ -56,6 +54,18 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Chyba při (de)aktivaci adresáře."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nelze aktualizovat adresář s prázdným jménem."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Chyba při aktualizaci adresáře."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadáno"
@@ -169,14 +179,6 @@ msgstr "Něco se pokazilo. "
 msgid "Error updating contact property."
 msgstr "Chyba při aktualizaci údaje kontaktu."
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Chyba při aktualizaci adresáře."
-
 #: 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ě."
@@ -223,71 +225,78 @@ msgstr "Soubor nebyl odeslán. Neznámá chyba"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužel, tato funkce nebyla ještě implementována."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Neimplementováno"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Tento parametr nemuže zůstat nevyplněn."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Prvky nelze převést.."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Upravit jméno"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Žádné soubory nebyly vybrány k nahrání."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vybrat typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Výsledek: "
@@ -300,129 +309,133 @@ msgstr "importováno v pořádku,"
 msgid " failed."
 msgstr "neimportováno."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresář nenalezen."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Toto není Váš adresář."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt nebyl nalezen."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizace"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Pracovní"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Domácí"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Hlas"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Import"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresáře"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zavřít"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastavit adresáře"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nový adresář"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav odkaz"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Stažení"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editovat"
-
-#: 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 "Odstranit"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Přetáhněte sem fotku pro její nahrání"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Smazat současnou fotku"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Upravit současnou fotku"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Nahrát novou fotku"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vybrat fotku z ownCloudu"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Upravit podrobnosti jména"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Odstranit"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Zadejte přezdívku"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddělte skupiny čárkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Upravit skupiny"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferovaný"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Prosím zadejte platnou e-mailovou adresu"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Zadat e-mailovou adresu"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Odeslat na adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Smazat e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Zadat telefoní číslo"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Smazat telefoní číslo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Upravit podrobnosti adresy"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Zde můžete připsat poznámky."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Přidat políčko"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Stáhnout kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
@@ -801,7 +792,7 @@ msgstr "Zobrazené jméno"
 msgid "Active"
 msgstr "Aktivní"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Uložit"
 
@@ -809,7 +800,7 @@ msgstr "Uložit"
 msgid "Submit"
 msgstr "Potvrdit"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Storno"
 
@@ -833,15 +824,15 @@ msgstr "Jméno nového adresáře"
 msgid "Importing contacts"
 msgstr "Importování kontaktů"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žádné kontakty v adresáři."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Přidat kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Nastavit adresář"
 
@@ -873,6 +864,34 @@ msgstr "Hlavní adresa (Kontakt etc)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Stažení"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editovat"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nový adresář"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index bfc8ad14e392898ff963a8d2a9b0dd5bd172ce8b..ebca07a442664abced6f6b238322ca8512b4ea21 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Leden"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 59288cbf813305630bc155c7cc00502afbb56713..6b10067fe4f0f7e6df346cebb7a16440ec5b9dcf 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -206,7 +206,7 @@ msgstr "Výchozí kvóta"
 msgid "Other"
 msgstr "Jiné"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -214,10 +214,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Vymazat"
diff --git a/l10n/da/contacts.po b/l10n/da/contacts.po
index d6f33b75f3e2657e8232758e18ba7b33e876c111..d95f9fcb44bc8d680460ba6e066447fc86dd187f 100644
--- a/l10n/da/contacts.po
+++ b/l10n/da/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fejl ved (de)aktivering af adressebogen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
@@ -34,7 +30,9 @@ msgstr "Der opstod en fejl ved tilføjelse af kontaktpersonen."
 msgid "element name is not set."
 msgstr "Elementnavnet er ikke medsendt."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "Intet ID medsendt."
 
@@ -58,6 +56,18 @@ msgstr "Kan ikke tilføje overlappende element."
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fejl ved (de)aktivering af adressebogen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan ikke opdatére adressebogen med et tomt navn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fejl ved opdatering af adressebog"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Intet ID medsendt"
@@ -171,14 +181,6 @@ msgstr "Noget gik grueligt galt. "
 msgid "Error updating contact property."
 msgstr "Fejl ved opdatering af egenskab for kontaktperson."
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Fejl ved opdatering af adressebog"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring."
@@ -225,71 +227,78 @@ msgstr "Ingen fil blev uploadet. Ukendt fejl."
 msgid "Contacts"
 msgstr "Kontaktpersoner"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Denne funktion er desværre ikke implementeret endnu"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Ikke implementeret"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fejl"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktperson"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Dette felt må ikke være tomt."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Kunne ikke serialisere elementerne."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Der er ikke valgt nogen filer at uploade."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Dr."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vælg type"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -302,129 +311,133 @@ msgstr " importeret "
 msgid " failed."
 msgstr " fejl."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressebogen blev ikke fundet."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dette er ikke din adressebog."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontaktperson kunne ikke findes."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbejde"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hjemme"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Telefonsvarer"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Besked"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Personsøger"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressebøger"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Luk"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurer adressebøger"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebog"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Rediger"
-
-#: 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 "Slet"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Drop foto for at uploade"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Slet nuværende foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Rediger nuværende foto"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Upload nyt foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vælg foto fra ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Rediger navnedetaljer."
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slet"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Indtast kaldenavn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Opdel gruppenavne med kommaer"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Rediger grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Foretrukken"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Indtast venligst en gyldig email-adresse."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Indtast email-adresse"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Send mail til adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Slet email-adresse"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Indtast telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Slet telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Rediger adresse detaljer"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Tilføj noter her."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Tilføj element"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Download kontaktperson"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Slet kontaktperson"
 
@@ -803,7 +794,7 @@ msgstr "Vist navn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Gem"
 
@@ -811,7 +802,7 @@ msgstr "Gem"
 msgid "Submit"
 msgstr "Gem"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -835,15 +826,15 @@ msgstr "Navn på ny adressebog"
 msgid "Importing contacts"
 msgstr "Importerer kontaktpersoner"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontaktpersoner i din adressebog."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Tilføj kontaktpeson."
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøger"
 
@@ -875,6 +866,34 @@ msgstr "Primær adresse (Kontak m. fl.)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebog"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 324afe6129d72728f142f9cc1f29bb3bf77386a7..c2a6184506b4234d44e6daf2514381d6ee9ed846 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januar"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index d4d081a64da795da7d75dfe7ffd7f61c7db4f256..4f4826be77df42ae773d9e148c8257997e417b9f 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -207,7 +207,7 @@ msgstr "Standard kvote"
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -215,10 +215,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Slet"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index 62fdc325659e910ee54af9c7e97ec0f25fd7e0aa..8218d777fca4e3637a378a370baddc6d5379e93f 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -22,8 +22,8 @@ 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"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -32,10 +32,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Erstellen des Kontakts fehlgeschlagen"
@@ -44,7 +40,9 @@ msgstr "Erstellen des Kontakts fehlgeschlagen"
 msgid "element name is not set."
 msgstr "Kein Name für das Element angegeben."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID ist nicht angegeben."
 
@@ -68,6 +66,18 @@ msgstr "Versuche, doppelte Eigenschaft hinzuzufügen: "
 msgid "Error adding contact property: "
 msgstr "Fehler beim Hinzufügen der Kontakteigenschaft:"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(De-)Aktivierung des Adressbuches fehlgeschlagen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Adressbuch aktualisieren fehlgeschlagen"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Keine ID angegeben"
@@ -181,14 +191,6 @@ msgstr "Irgendwas ist hier so richtig schief gelaufen. "
 msgid "Error updating contact property."
 msgstr "Kontakteigenschaft aktualisieren fehlgeschlagen"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Adressbuch kann nicht mir leeren Namen aktualisiert werden."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Adressbuch aktualisieren fehlgeschlagen"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Übertragen der Kontakte fehlgeschlagen"
@@ -235,71 +237,78 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Diese Funktion steht leider noch nicht zur Verfügung"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Nicht Verfügbar"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Konnte keine gültige Adresse abrufen"
 
-#: 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Neu"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Dieses Feld darf nicht Leer sein."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Konnte Elemente nicht serialisieren"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 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:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Name ändern"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Keine Datei(en) zum Hochladen ausgewählt"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Wähle Typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Ergebnis: "
@@ -312,129 +321,133 @@ msgstr " importiert, "
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressbuch nicht gefunden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dies ist nicht dein Adressbuch."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt konnte nicht gefunden werden."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbeit"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Zuhause"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Anruf"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mitteilung"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Anruf"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Kunden"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Lieferant"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Feiertage"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Ideen"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Reise"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Jubiläum"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Andere"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Persönlich"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projekte"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Fragen"
 
@@ -452,209 +465,187 @@ msgstr "Importieren"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Schließen"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Nächster Kontakt aus der Liste"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Vorheriger Kontakt aus der Liste"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Ausklappen/Einklappen des Adressbuches"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Nächstes/Vorhergehendes Adressbuch"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Kontaktliste neu laden"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Aktuellen Kontakt löschen"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adressbücher konfigurieren"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Neues Adressbuch"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Herunterladen"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: 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 "Löschen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Zieh' ein Foto hierher zum Hochladen"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Derzeitiges Foto löschen"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Foto ändern"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Neues Foto hochladen"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Foto aus ownCloud auswählen"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Name ändern"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Spitzname angeben"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Webseite"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Webseite aufrufen"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Gruppen mit Komma getrennt"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Gruppen editieren"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Bevorzugt"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Bitte eine gültige E-Mail-Adresse angeben."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "E-Mail-Adresse angeben."
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "E-Mail an diese Adresse schreiben"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "E-Mail-Adresse löschen"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Telefonnummer angeben"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefonnummer löschen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Auf Karte anzeigen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Adressinformationen ändern"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Füge hier Notizen ein."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Feld hinzufügen"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notiz"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kontakt herunterladen"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kontakt löschen"
 
@@ -813,7 +804,7 @@ msgstr "Anzeigename"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Speichern"
 
@@ -821,7 +812,7 @@ msgstr "Speichern"
 msgid "Submit"
 msgstr "Eintragen"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -845,15 +836,15 @@ msgstr "Name des neuen Adressbuchs"
 msgid "Importing contacts"
 msgstr "Kontakte werden importiert"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du hast keine Kontakte im Adressbuch."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Kontakt hinzufügen"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Adressbücher konfigurieren"
 
@@ -885,6 +876,34 @@ msgstr "primäre Adresse (für Kontact o.ä. Programme)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Nur lesende(r) vCalender-Verzeichnis-Link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Herunterladen"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Neues Adressbuch"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d2ab1e7a26e9137e084c3722dabc81a564eab1dc..bee17cb28096a06bbd5feb29c576f2450bc6c3e9 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -45,10 +45,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januar"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 92690194d8e3a64f5b07c100bfdaf08d7edf7250..7fa8d58e355f7a3ddb4792fd79a6b8bdb057aa46 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 18:48+0000\n"
-"Last-Translator: Phi Lieb <>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -209,7 +209,7 @@ msgstr "Standard Quota"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "Unteradministrator"
 
@@ -217,10 +217,6 @@ msgstr "Unteradministrator"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Unteradministrator für..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Löschen"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index 59ca23304ea0b4a260db12718414503a3f9fb5c3..20cd68f115cccca3ffd122e52aa161447405b5f3 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/contacts.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -23,10 +23,6 @@ msgstr ""
 "Language: el\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 "Σφάλμα κατά την προσθήκη επαφής."
@@ -35,7 +31,9 @@ msgstr "Σφάλμα κατά την προσθήκη επαφής."
 msgid "element name is not set."
 msgstr "δεν ορίστηκε όνομα στοιχείου"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "δεν ορίστηκε id"
 
@@ -59,6 +57,18 @@ msgstr "Προσπάθεια προσθήκης διπλότυπης ιδιότ
 msgid "Error adding contact property: "
 msgstr "Σφάλμα στη προσθήκη ιδιότητας επαφής"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Δε δόθηκε ID"
@@ -172,14 +182,6 @@ msgstr "Κάτι χάθηκε στο άγνωστο. "
 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 "Σφάλμα κατά την αποθήκευση επαφών"
@@ -226,71 +228,78 @@ msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλ
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Δεν έχει υλοποιηθεί"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Επαφή"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Νέο"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Νέα επαφή"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Το πεδίο δεν πρέπει να είναι άδειο."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Αδύνατο να μπουν σε σειρά τα στοιχεία"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Αλλαγή ονόματος"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Επιλογή τύπου"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Αποτέλεσμα: "
@@ -303,129 +312,133 @@ msgstr " εισάγεται,"
 msgid " failed."
 msgstr " απέτυχε."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Αυτό δεν είναι το βιβλίο διευθύνσεων σας."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Η επαφή δεν μπόρεσε να βρεθεί."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Τηλέφωνο"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Εργασία"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Σπίτι"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Κείμενο"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ομιλία"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Φαξ"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Βίντεο"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Γενέθλια"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Επιχείρηση"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Κάλεσε"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Πελάτες"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Προμηθευτής"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Διακοπές"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Ιδέες"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Ταξίδι"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Ιωβηλαίο"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Άλλο"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Προσωπικό"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Έργα"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
@@ -445,207 +458,185 @@ msgstr "Εισαγωγή"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Βιβλία διευθύνσεων"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Κλείσιμο  "
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Συντομεύσεις πλητρολογίου"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Επόμενη επαφή στη λίστα"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Προηγούμενη επαφή στη λίστα"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Επόμενο/προηγούμενο βιβλίο διευθύνσεων"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Ανανέωσε τη λίστα επαφών"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Προσθήκη νέου βιβλίου επαφών"
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Σύνδεσμος CardDav"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Ρίξε μια φωτογραφία για ανέβασμα"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Διαγραφή τρέχουσας φωτογραφίας"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Επεξεργασία τρέχουσας φωτογραφίας"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Ανέβασε νέα φωτογραφία"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Επέλεξε φωτογραφία από το ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Αλλάξτε τις λεπτομέρειες ονόματος"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Παρατσούκλι"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Εισάγετε παρατσούκλι"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Ιστότοπος"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Πήγαινε στον ιστότοπο"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "ΗΗ-ΜΜ-ΕΕΕΕ"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Διαχώρισε τις ομάδες με κόμμα "
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Επεξεργασία ομάδων"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Προτιμώμενο"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Παρακαλώ εισήγαγε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Εισήγαγε  διεύθυνση ηλεκτρονικού ταχυδρομείου"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Αποστολή σε διεύθυνση"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Διαγραφή διεύθυνση email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Εισήγαγε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Διέγραψε αριθμό τηλεφώνου"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Προβολή στο χάρτη"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Επεξεργασία λεπτομερειών διεύθυνσης"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Πρόσθεσε τις σημειώσεις εδώ"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Προσθήκη πεδίου"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Σημείωση"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Λήψη επαφής"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Διαγραφή επαφής"
 
@@ -804,7 +795,7 @@ msgstr "Προβαλλόμενο όνομα"
 msgid "Active"
 msgstr "Ενεργό"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -812,7 +803,7 @@ msgstr "Αποθήκευση"
 msgid "Submit"
 msgstr "Καταχώρηση"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -836,15 +827,15 @@ msgstr "Όνομα νέου βιβλίου διευθύνσεων"
 msgid "Importing contacts"
 msgstr "Εισαγωγή επαφών"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Δεν έχεις επαφές στο βιβλίο διευθύνσεων"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Προσθήκη επαφής"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Ρύθμισε το βιβλίο διευθύνσεων"
 
@@ -876,6 +867,34 @@ msgstr "Κύρια διεύθυνση"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "vCard σύνδεσμος(οι) φάκελου μόνο για ανάγνωση"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Λήψη"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Νέο βιβλίο διευθύνσεων"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 97808b122bb4e08d6cfe052e71143e4141ccf7da..5f3262deb6701d02891fc5124a2c953538ce9831 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Ιανουάριος"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 02857c416c85ca2f4a113d312973ba4703d19bca..d0a70f292885de24c06579261d8f73ce45a8d4af 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 11:41+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -207,7 +207,7 @@ msgstr "Προεπιλεγμένο όριο"
 msgid "Other"
 msgstr "Άλλα"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -215,10 +215,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Σύνολο χώρου"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin για ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Διαγραφή"
diff --git a/l10n/eo/contacts.po b/l10n/eo/contacts.po
index b040e06d2c4b71beaa13824da28baa762697d627..b892bbe22c5289c2cc5f29c00181500085c33d19 100644
--- a/l10n/eo/contacts.po
+++ b/l10n/eo/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Eraro dum (mal)aktivigo de adresaro."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Eraro okazis dum aldono de kontakto."
@@ -30,7 +26,9 @@ msgstr "Eraro okazis dum aldono de kontakto."
 msgid "element name is not set."
 msgstr "eronomo ne agordiĝis."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "identigilo ne agordiĝis."
 
@@ -54,6 +52,18 @@ msgstr "Provante aldoni duobligitan propraĵon:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Eraro dum (mal)aktivigo de adresaro."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eraro dum ĝisdatigo de adresaro."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Neniu identigilo proviziĝis."
@@ -167,14 +177,6 @@ msgstr "Io FUBAR-is."
 msgid "Error updating contact property."
 msgstr "Eraro dum ĝisdatigo de kontaktopropraĵo."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne eblas ĝisdatigi adresaron kun malplena nomo."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eraro dum ĝisdatigo de adresaro."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Eraro dum alŝutiĝis kontaktoj al konservejo."
@@ -221,71 +223,78 @@ msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Ne disponebla"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Eraro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ĉi tiu propraĵo devas ne esti malplena."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Redakti nomon"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Neniu dosiero elektita por alŝuto."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Elektu tipon"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Rezulto: "
@@ -298,129 +307,133 @@ msgstr " enportoj, "
 msgid " failed."
 msgstr "malsukcesoj."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresaro ne troviĝis."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ĉi tiu ne estas via adresaro."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Ne eblis trovi la kontakton."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adreso"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Retpoŝtadreso"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizaĵo"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Laboro"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hejmo"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Teksto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voĉo"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fakso"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Videaĵo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Televokilo"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Interreto"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Naskiĝotago"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr "Enporti"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresaroj"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermi"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Agordi adresarojn"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova adresaro"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-ligilo"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Elŝuti"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Redakti"
-
-#: 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 "Forigi"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Demeti foton por alŝuti"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Forigi nunan foton"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Redakti nunan foton"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Alŝuti novan foton"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Elekti foton el ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Redakti detalojn de nomo"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Forigi"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Enigu kromnomon"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Disigi grupojn per komoj"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Redakti grupojn"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferata"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Bonvolu specifi validan retpoŝtadreson."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Enigi retpoŝtadreson"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Retpoŝtmesaĝo al adreso"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Forigi retpoŝþadreson"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Enigi telefonnumeron"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Forigi telefonnumeron"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vidi en mapo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Redakti detalojn de adreso"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Aldoni notojn ĉi tie."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Aldoni kampon"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Noto"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Elŝuti kontakton"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Forigi kontakton"
 
@@ -799,7 +790,7 @@ msgstr "Montronomo"
 msgid "Active"
 msgstr "Aktiva"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Konservi"
 
@@ -807,7 +798,7 @@ msgstr "Konservi"
 msgid "Submit"
 msgstr "Sendi"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -831,15 +822,15 @@ msgstr "Nomo de nova adresaro"
 msgid "Importing contacts"
 msgstr "Enportante kontaktojn"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Vi ne havas kontaktojn en via adresaro"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Aldoni kontakton"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Agordi adresarojn"
 
@@ -871,6 +862,34 @@ msgstr "Ĉefa adreso (por Kontakt kaj aliaj)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Elŝuti"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Redakti"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova adresaro"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 88e04e3e1021dbfacd7afb3845867040e003797f..8d72ea6ef5659fb1eabcec6d78347a54137cb0af 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januaro"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 662744f09158c1b32ea88b50f7027dd212740cd5..3435e84663d8881cc4e94f28e374aa9fbed07a86 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr "Defaŭlta kvoto"
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvoto"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/es/contacts.po b/l10n/es/contacts.po
index cecb721b9aad62625c9fb83946779b7f5f6ef882..14340a646e651261dd359e894930d22e3f24329b 100644
--- a/l10n/es/contacts.po
+++ b/l10n/es/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Error al (des)activar libreta de direcciones."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Se ha producido un error al añadir el contacto."
@@ -34,7 +30,9 @@ msgstr "Se ha producido un error al añadir el contacto."
 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
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "no se ha puesto ninguna ID."
 
@@ -58,6 +56,18 @@ msgstr "Intentando añadir una propiedad duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Error al (des)activar libreta de direcciones."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "No se puede actualizar una libreta de direcciones sin nombre."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Error al actualizar la libreta de direcciones."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "No se ha proporcionado una ID"
@@ -171,14 +181,6 @@ msgstr "Plof. Algo ha fallado."
 msgid "Error updating contact property."
 msgstr "Error al actualizar una propiedad del contacto."
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Error al actualizar la libreta de direcciones."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Error al subir contactos al almacenamiento."
@@ -225,71 +227,78 @@ msgstr "Fallo no se subió el fichero"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Perdón esta función no esta aún implementada"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "No esta implementada"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fallo"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Este campo no puede estar vacío."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Fallo no podido ordenar los elementos"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Edita el Nombre"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "No hay ficheros seleccionados para subir"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "El fichero que quieres subir excede el tamaño máximo permitido en este servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Selecciona el tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado :"
@@ -302,129 +311,133 @@ msgstr "Importado."
 msgid " failed."
 msgstr "Fallo."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Libreta de direcciones no encontrada."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta no es tu agenda de contactos."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "No se ha podido encontrar el contacto."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Dirección"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Trabajo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Particular"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Móvil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Localizador"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Libretas de direcciones"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Cierra."
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar libretas de direcciones"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nueva libreta de direcciones"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Enlace CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: 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 "Borrar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Suelta una foto para subirla"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Eliminar fotografía actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar fotografía actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Subir nueva fotografía"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Seleccionar fotografía desde ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar los detalles del nombre"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Borrar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Alias"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introduce un alias"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separa los grupos con comas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor especifica una dirección de correo electrónico válida."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introduce una dirección de correo electrónico"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Enviar por correo a la dirección"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Eliminar dirección de correo electrónico"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Introduce un número de teléfono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Eliminar número de teléfono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar detalles de la dirección"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Añade notas aquí."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Añadir campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Eliminar contacto"
 
@@ -803,7 +794,7 @@ msgstr "Nombre a mostrar"
 msgid "Active"
 msgstr "Activo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Guardar"
 
@@ -811,7 +802,7 @@ msgstr "Guardar"
 msgid "Submit"
 msgstr "Aceptar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -835,15 +826,15 @@ msgstr "Nombre de la nueva agenda"
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "No hay contactos en tu agenda."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Añadir contacto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar agenda"
 
@@ -875,6 +866,34 @@ msgstr "Dirección primaria (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nueva libreta de direcciones"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e55ee419584ff49257467579de6d24381b466348..0dfd58a77a735c9d5ab80217b8ad90b1bc42bc68 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Enero"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index e5e6215db31ad6254b144945596641360250f4d8..37d1b2e5344daf53f8320f9abcd7561ffc1a23e8 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 04:34+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -208,7 +208,7 @@ msgstr "Cuota predeterminada"
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Cuota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin para ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/et_EE/contacts.po b/l10n/et_EE/contacts.po
index 41ce51e36ac27ecd5d117955e45fdb2cca36fff8..8ca1073883ffd6d895846fb99101c7f778f55c1a 100644
--- a/l10n/et_EE/contacts.po
+++ b/l10n/et_EE/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Viga aadressiraamatu (de)aktiveerimisel."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Konktakti lisamisel tekkis viga."
@@ -30,7 +26,9 @@ msgstr "Konktakti lisamisel tekkis viga."
 msgid "element name is not set."
 msgstr "elemendi nime pole määratud."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID on määramata."
 
@@ -54,6 +52,18 @@ msgstr "Proovitakse lisada topeltomadust: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Viga aadressiraamatu (de)aktiveerimisel."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Viga aadressiraamatu uuendamisel."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID-d pole sisestatud"
@@ -167,14 +177,6 @@ msgstr "Midagi läks tõsiselt metsa."
 msgid "Error updating contact property."
 msgstr "Viga konktaki korralikul uuendamisel."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Tühja nimega aadressiraamatut ei saa uuendada."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Viga aadressiraamatu uuendamisel."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Viga kontaktide üleslaadimisel kettale."
@@ -221,71 +223,78 @@ msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Vabandust, aga see funktsioon pole veel valmis"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Pole implementeeritud"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Viga"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "See omadus ei tohi olla tühi."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Muuda nime"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Üleslaadimiseks pole faile valitud."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vali tüüp"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Tulemus: "
@@ -298,129 +307,133 @@ msgstr " imporditud, "
 msgid " failed."
 msgstr " ebaõnnestus."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Aadressiraamatut ei leitud"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "See pole sinu aadressiraamat."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakti ei leitud."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Aadress"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Töö"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Kodu"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Hääl"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Sõnum"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Piipar"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr "Impordi"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Aadressiraamatud"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Sule"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Seadista aadressiraamatut"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Uus aadressiraamat"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Lae alla"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Muuda"
-
-#: 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 "Kustuta"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Lohista üleslaetav foto siia"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Kustuta praegune foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Muuda praegust pilti"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Lae üles uus foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vali foto ownCloudist"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Muuda nime üksikasju"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Kustuta"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Sisesta hüüdnimi"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd.mm.yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Eralda grupid komadega"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Muuda gruppe"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Eelistatud"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Palun sisesta korrektne e-posti aadress."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Sisesta e-posti aadress"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Kiri aadressile"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Kustuta e-posti aadress"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Sisesta telefoninumber"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Kustuta telefoninumber"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vaata kaardil"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Muuda aaressi infot"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Lisa märkmed siia."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Lisa väli"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Märkus"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Lae kontakt alla"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kustuta kontakt"
 
@@ -799,7 +790,7 @@ msgstr "Näidatav nimi"
 msgid "Active"
 msgstr "Aktiivne"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salvesta"
 
@@ -807,7 +798,7 @@ msgstr "Salvesta"
 msgid "Submit"
 msgstr "Saada"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -831,15 +822,15 @@ msgstr "Uue aadressiraamatu nimi"
 msgid "Importing contacts"
 msgstr "Kontaktide importimine"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Sinu aadressiraamatus pole ühtegi kontakti."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Lisa kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Seadista aadressiraamatuid"
 
@@ -871,6 +862,34 @@ msgstr "Peamine aadress"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Lae alla"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Muuda"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Uus aadressiraamat"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index a98c7fc27680c36e6ac857ec4bb06b193bd0b04b..8e0bb95d9f7672e4f0f6c7ab5b26ac87da06f23d 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Jaanuar"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e9ec42e53086d6fec382a5201d232631b8fe8d60..56a6b7f20abf9b4dbe172f721d80252b4fe934f4 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Vaikimisi kvoot"
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Mahupiir"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/eu/contacts.po b/l10n/eu/contacts.po
index a35dba2f955c8ebb97da9539fd579ee38df8dd45..1d8001bc54aab60f5e0c195e6a352aac6b024258 100644
--- a/l10n/eu/contacts.po
+++ b/l10n/eu/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: 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:47
 msgid "There was an error adding the contact."
 msgstr "Errore bat egon da kontaktua gehitzerakoan"
@@ -32,13 +28,15 @@ msgstr "Errore bat egon da kontaktua gehitzerakoan"
 msgid "element name is not set."
 msgstr "elementuaren izena ez da ezarri."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 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 ""
+msgstr "Ezin izan da kontaktua analizatu:"
 
 #: ajax/addproperty.php:56
 msgid "Cannot add empty property."
@@ -54,7 +52,19 @@ msgstr "Propietate bikoiztuta gehitzen saiatzen ari zara:"
 
 #: ajax/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "Errore bat egon da kontaktuaren propietatea gehitzean:"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Errore bat egon da helbide-liburua (des)gaitzen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Errore bat egon da helbide liburua eguneratzen."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -169,14 +179,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Errorea kontaktu propietatea eguneratzean."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ezin da helbide liburua eguneratu izen huts batekin."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Errore bat egon da helbide liburua eguneratzen."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore bat egon da kontaktuak biltegira igotzerakoan."
@@ -223,71 +225,78 @@ msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Barkatu, aukera hau ez da oriandik inplementatu"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Inplementatu gabe"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errorea"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
-msgstr ""
+msgstr "Berria"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
-msgstr ""
+msgstr "Kontaktu berria"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Propietate hau ezin da hutsik egon."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Ezin izan dira elementuak serializatu."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editatu izena"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ez duzu igotzeko fitxategirik hautatu."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Hautatu mota"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Emaitza:"
@@ -300,131 +309,135 @@ msgstr " inportatua, "
 msgid " failed."
 msgstr "huts egin du."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Helbide liburua ez da aurkitu"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Hau ez da zure helbide liburua."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Ezin izan da kontaktua aurkitu."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Helbidea"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Erakundea"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Lana"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Etxea"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Testua"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ahotsa"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mezua"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax-a"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Bideoa"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Jaioteguna"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
-msgstr ""
+msgstr "Deia"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Bezeroak"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Oporrak"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Ideiak"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Bidaia"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Bilera"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Bestelakoa"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Pertsonala"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Proiektuak"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Galderak"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -440,209 +453,187 @@ msgstr "Inportatu"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Helbide Liburuak"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Itxi"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Teklatuaren lasterbideak"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
-msgstr ""
+msgstr "Nabigazioa"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
-msgstr ""
+msgstr "Hurrengoa kontaktua zerrendan"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Aurreko kontaktua zerrendan"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Zabaldu/tolestu uneko helbide-liburua"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Hurrengo/aurreko helbide-liburua"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Ekintzak"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Gaurkotu kontaktuen zerrenda"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Gehitu kontaktu berria"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Gehitu helbide-liburu berria"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguratu Helbide Liburuak"
+msgstr "Ezabatu uneko kontaktuak"
 
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Helbide-liburu berria"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav lotura"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Deskargatu"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editatu"
-
-#: 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 "Ezabatu"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Askatu argazkia igotzeko"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Ezabatu oraingo argazkia"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editatu oraingo argazkia"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Igo argazki berria"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Hautatu argazki bat ownCloudetik"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editatu izenaren zehaztasunak"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Ezizena"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Sartu ezizena"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Web orria"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.webgunea.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Web orrira joan"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Banatu taldeak komekin"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editatu taldeak"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Hobetsia"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Mesedez sartu eposta helbide egoki bat"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Sartu eposta helbidea"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Bidali helbidera"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Ezabatu eposta helbidea"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Sartu telefono zenbakia"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Ezabatu telefono zenbakia"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ikusi mapan"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editatu helbidearen zehaztasunak"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Gehitu oharrak hemen."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Gehitu eremua"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Oharra"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Deskargatu kontaktua"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Ezabatu kontaktua"
 
@@ -665,11 +656,11 @@ msgstr "Posta kutxa"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Kalearen helbidea"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Kalea eta zenbakia"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -677,7 +668,7 @@ msgstr "Hedatua"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Etxe zenbakia eab."
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -698,7 +689,7 @@ msgstr "Posta kodea"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Posta kodea"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -801,7 +792,7 @@ msgstr "Bistaratzeko izena"
 msgid "Active"
 msgstr "Aktibo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Gorde"
 
@@ -809,7 +800,7 @@ msgstr "Gorde"
 msgid "Submit"
 msgstr "Bidali"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -833,29 +824,29 @@ msgstr "Helbide liburuaren izena"
 msgid "Importing contacts"
 msgstr "Kontaktuak inportatzen"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Ez duzu kontakturik zure helbide liburuan."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Gehitu kontaktua"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfiguratu helbide liburuak"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Hautatu helbide-liburuak"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Sartu izena"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Sartu deskribapena"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -873,6 +864,34 @@ msgstr "Helbide nagusia"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editatu"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Helbide-liburu berria"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 8fdfcdcd07b7a5c83a9e22865dc4124e7aef9c5f..f758d66577b00b81f5629a98e3a6572205f156b0 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Urtarrila"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 5b5b358bcaf47aa09040c6e87235e9b80a5bcd0b..eda83576c67cc25025e16633163e9bc244f4b936 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -38,7 +38,7 @@ msgstr "Baliogabeko eskaria"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentifikazio errorea"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -62,7 +62,7 @@ msgstr "Euskera"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Segurtasun abisua"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -204,18 +204,14 @@ msgstr "Kuota lehentsia"
 msgid "Other"
 msgstr "Besteak"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu_ES/contacts.po b/l10n/eu_ES/contacts.po
index ff9ad670179a691564fc8d7e59374d4d6729df23..7b57737f9521a0e18229b004c4d1fc89d854c004 100644
--- a/l10n/eu_ES/contacts.po
+++ b/l10n/eu_ES/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 98e3012b65cd0f55a4741c8f8001c47534df8163..0a342ad7e0272dfca8d31025fedd48cb52c80a5f 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 6e77d37cb42815daa4fdbf528491fb2436a6e7d2..8b8dcb1934fa451868edac6de54f6385d4919643 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 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 f453f6e2c611ae4d6de4d85b7ad891d6fb3435df..50dc9b76f28419651e7a589c584cdd40a99594ed 100644
--- a/l10n/fa/contacts.po
+++ b/l10n/fa/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\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 "یک خطا در افزودن اطلاعات شخص مورد نظر"
@@ -30,7 +26,9 @@ msgstr "یک خطا در افزودن اطلاعات شخص مورد نظر"
 msgid "element name is not set."
 msgstr "نام اصلی تنظیم نشده است"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "شناسه تعیین نشده"
 
@@ -54,6 +52,18 @@ msgstr "امتحان کردن برای وارد کردن مشخصات تکرار
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "خطا در (غیر) فعال سازی کتابچه نشانه ها"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "خطا در هنگام بروزرسانی کتابچه نشانی ها"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "هیچ شناسه ای ارائه نشده"
@@ -167,14 +177,6 @@ msgstr "چند چیز به FUBAR رفتند"
 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 "خطا در هنگام بارگذاری و ذخیره سازی"
@@ -221,71 +223,78 @@ msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 msgid "Contacts"
 msgstr "اشخاص"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "با عرض پوزش،این قابلیت هنوز اجرا نشده است"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "انجام نشد"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "خطا"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "اشخاص"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "این ویژگی باید به صورت غیر تهی عمل کند"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "قابلیت مرتب سازی عناصر وجود ندارد"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "نام تغییر"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "نوع را انتخاب کنید"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "نتیجه:"
@@ -298,129 +307,133 @@ msgstr "وارد شد،"
 msgid " failed."
 msgstr "ناموفق"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "کتابچه نشانی ها یافت نشد"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "این کتابچه ی نشانه های شما نیست"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "اتصال ویا تماسی یافت نشد"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "نشانی"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "تلفن"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "نشانی پست الکترنیک"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "نهاد(ارگان)"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "کار"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "خانه"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "موبایل"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "متن"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "صدا"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "پیغام"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "دورنگار:"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "رسانه تصویری"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "صفحه"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "اینترنت"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "روزتولد"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr "وارد کردن"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "کتابچه ی نشانی ها"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "بستن"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "CardDav Link"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "تصویر را به اینجا بکشید تا بار گذازی شود"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "پاک کردن تصویر کنونی"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "ویرایش تصویر کنونی"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "بار گذاری یک تصویر جدید"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "انتخاب یک تصویر از ابر های شما"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "ویرایش نام جزئیات"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "پاک کردن"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "نام مستعار"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "یک نام مستعار وارد کنید"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "گروه ها"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "جدا کردن گروه ها به وسیله درنگ نما"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "ویرایش گروه ها"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "مقدم"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "لطفا یک پست الکترونیکی معتبر وارد کنید"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "یک  پست الکترونیکی وارد کنید"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "به نشانی  ارسال شد"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "پاک کردن نشانی پست الکترونیکی"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "شماره تلفن راوارد کنید"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "پاک کردن شماره تلفن"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "دیدن روی نقشه"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "ویرایش جزئیات نشانی ها"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "اینجا یادداشت ها را بیافزایید"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "اضافه کردن فیلد"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "شماره تلفن"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "یادداشت"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "دانلود مشخصات اشخاص"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "پاک کردن  اطلاعات شخص مورد نظر"
 
@@ -799,7 +790,7 @@ msgstr "نام برای نمایش"
 msgid "Active"
 msgstr "فعال"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "ذخیره سازی"
 
@@ -807,7 +798,7 @@ msgstr "ذخیره سازی"
 msgid "Submit"
 msgstr "ارسال"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -831,15 +822,15 @@ msgstr "نام کتابچه نشانی جدید"
 msgid "Importing contacts"
 msgstr "وارد کردن اشخاص"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "شماهیچ شخصی در  کتابچه نشانی خود ندارید"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "افزودن اطلاعات شخص مورد نظر"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "پیکربندی کتابچه ی نشانی ها"
 
@@ -871,6 +862,34 @@ msgstr "نشانی اولیه"
 msgid "iOS/OS X"
 msgstr "iOS/OS X "
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "بارگیری"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "ویرایش"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "کتابچه نشانه های جدید"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index e2c97e1c454c9c0291aa9eb23f99ac23cb702a1a..05c5ea57eb7c6092fb7e044db2cb8b25e2cd9fd5 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "ژانویه"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index ab1c42e2957a14352e2a2832ccdeadbae1064c2b..6ccc6f4586be7049bcdec70126f9f5d1cfbc82c4 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr "سهم پیش فرض"
 msgid "Other"
 msgstr "سایر"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "سهم"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "پاک کردن"
diff --git a/l10n/fi_FI/contacts.po b/l10n/fi_FI/contacts.po
index 8ec5c5cc6203fe528d783334c9eacd12419325a8..0df7c2a0cdde8e6504a61b8beab48641dfe4b34b 100644
--- a/l10n/fi_FI/contacts.po
+++ b/l10n/fi_FI/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: fi_FI\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 "Virhe yhteystietoa lisättäessä."
@@ -33,7 +29,9 @@ msgstr "Virhe yhteystietoa lisättäessä."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -57,6 +55,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Virhe päivitettäessä osoitekirjaa."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -170,14 +180,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Virhe päivitettäessä yhteystiedon ominaisuutta."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Virhe päivitettäessä osoitekirjaa."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -224,71 +226,78 @@ msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Virhe"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Uusi"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Muokkaa nimeä"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Tiedostoja ei ole valittu lähetettäväksi."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Tulos: "
@@ -301,129 +310,133 @@ msgstr " tuotu, "
 msgid " failed."
 msgstr " epäonnistui."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Osoitekirjaa ei löytynyt."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Tämä ei ole osoitekirjasi."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Yhteystietoa ei löytynyt."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Työ"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Koti"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Teksti"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ääni"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faksi"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Hakulaite"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Työ"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Muu"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Kysymykset"
 
@@ -443,207 +456,185 @@ msgstr "Tuo"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Osoitekirjat"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Sulje"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Päivitä yhteystietoluettelo"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Lisää uusi yhteystieto"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Lisää uusi osoitekirja"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Poista nykyinen yhteystieto"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Muokkaa osoitekirjoja"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Uusi osoitekirja"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav-linkki"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Lataa"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: 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 "Poista"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Poista nykyinen valokuva"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Muokkaa nykyistä valokuvaa"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Lähetä uusi valokuva"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Valitse valokuva ownCloudista"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Muokkaa nimitietoja"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Poista"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Anna kutsumanimi"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Verkkosivu"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Siirry verkkosivulle"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Erota ryhmät pilkuilla"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Muokkaa ryhmiä"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Anna kelvollinen sähköpostiosoite."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Anna sähköpostiosoite"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Poista sähköpostiosoite"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Anna puhelinnumero"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Poista puhelinnumero"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Näytä kartalla"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Muokkaa osoitetietoja"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Lisää huomiot tähän."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Lisää kenttä"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Puhelin"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Huomio"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Lataa yhteystieto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Poista yhteystieto"
 
@@ -802,7 +793,7 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Tallenna"
 
@@ -810,7 +801,7 @@ msgstr "Tallenna"
 msgid "Submit"
 msgstr "Lähetä"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Peru"
 
@@ -834,15 +825,15 @@ msgstr "Uuden osoitekirjan nimi"
 msgid "Importing contacts"
 msgstr "Tuodaan yhteystietoja"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Osoitekirjassasi ei ole yhteystietoja."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Lisää yhteystieto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Muokkaa osoitekirjoja"
 
@@ -874,6 +865,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Lataa"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Uusi osoitekirja"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 652247ff5c86a73192e6337e17798aef644b4464..072f0ad9ca4fd4e34dbfb820ae7ea276652657ba 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Tammikuu"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d79aad9bbd2bf99688714e9a41ec271b848b576e..012ddb1408ddf6ce4f63fd6383d82bd94319298e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 15:51+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Oletuskiintiö"
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kiintiö"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Poista"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 9d6d8f6ccd5428661005af3820aa74453e9c27c9..6fac7c438266b616529756def31db43e3432ee11 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,8 +17,8 @@ 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"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Une erreur s'est produite lors de l'ajout du contact."
@@ -39,7 +35,9 @@ msgstr "Une erreur s'est produite lors de l'ajout du contact."
 msgid "element name is not set."
 msgstr "Le champ Nom n'est pas défini."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "L'ID n'est pas défini."
 
@@ -63,6 +61,18 @@ msgstr "Ajout d'une propriété en double:"
 msgid "Error adding contact property: "
 msgstr "Erreur pendant l'ajout de la propriété du contact :"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erreur lors de la mise à jour du carnet d'adresses."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Aucun ID fourni"
@@ -176,14 +186,6 @@ msgstr "Quelque chose est FUBAR."
 msgid "Error updating contact property."
 msgstr "Erreur lors de la mise à jour du champ."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Impossible de mettre à jour le carnet d'adresses avec un nom vide."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Erreur lors de la mise à jour du carnet d'adresses."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
@@ -230,71 +232,78 @@ msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Pas encore implémenté"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
-#: 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nouveau"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Nouveau Contact"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 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:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Sélectionner un type"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Résultat :"
@@ -307,129 +316,133 @@ msgstr "importé,"
 msgid " failed."
 msgstr "échoué."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Carnet d'adresses introuvable."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Business"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Livreur"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Trajet"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Rendez-vous"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Questions"
 
@@ -449,207 +462,185 @@ msgstr "Importer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Contact suivant dans la liste"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Contact précédent dans la liste"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Passer au carnet d'adresses suivant/précédent"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Paramétrer carnet d'adresses"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nouveau Carnet d'adresses"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Lien CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Télécharger"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modifier"
-
-#: 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 "Supprimer"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Glisser une photo pour l'envoi"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Supprimer la photo actuelle"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editer la photo actuelle"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Envoyer une nouvelle photo"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Sélectionner une photo depuis ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editer les noms"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Supprimer"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Surnom"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Entrer un surnom"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Page web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Allez à la page web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "jj-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Séparer les groupes avec des virgules"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editer les groupes"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Préféré"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Merci d'entrer une adresse e-mail valide."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Entrer une adresse e-mail"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Envoyer à l'adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Supprimer l'adresse e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Entrer un numéro de téléphone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Supprimer le numéro de téléphone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Voir sur une carte"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editer les adresses"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Ajouter des notes ici."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Ajouter un champ."
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Téléphone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Télécharger le contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Supprimer le contact"
 
@@ -808,7 +799,7 @@ msgstr "Nom"
 msgid "Active"
 msgstr "Carnet actif"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -816,7 +807,7 @@ msgstr "Sauvegarder"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -840,15 +831,15 @@ msgstr "Nom du nouveau carnet d'adresses"
 msgid "Importing contacts"
 msgstr "Importation des contacts"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Il n'y a pas de contact dans votre carnet d'adresses."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Ajouter un contact"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Paramétrer carnet d'adresses"
 
@@ -880,6 +871,34 @@ msgstr "Adresse principale"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Télécharger"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modifier"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nouveau Carnet d'adresses"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 79d3b618b1f9f61b555884f73647b2160bd27c81..dfb7e40edfb571522337a36138729d8d874bacb8 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Janvier"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ea9e3f885e9224035e3568ede97e28f23354a1b6..ad7a053a98f4e17f187b1f61ee563838d913badf 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 00:49+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -208,7 +208,7 @@ msgstr "Quota par défaut"
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin pour ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/gl/contacts.po b/l10n/gl/contacts.po
index 521bb00899b4e483851b9c2af0cb372add851142..24c694cdea44c548c5c9428d7b70394e0eb6f98d 100644
--- a/l10n/gl/contacts.po
+++ b/l10n/gl/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Produciuse un erro (des)activando a axenda."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Produciuse un erro engadindo o contacto."
@@ -31,7 +27,9 @@ msgstr "Produciuse un erro engadindo o contacto."
 msgid "element name is not set."
 msgstr "non se nomeou o elemento."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "non se estableceu o id."
 
@@ -55,6 +53,18 @@ msgstr "Tentando engadir propiedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Produciuse un erro (des)activando a axenda."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Produciuse un erro actualizando a axenda."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Non se proveeu ID"
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Produciuse un erro actualizando a propiedade do contacto."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Non se pode actualizar a libreta de enderezos sen completar o nome."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Produciuse un erro actualizando a axenda."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro subindo os contactos ao almacén."
@@ -222,71 +224,78 @@ msgstr "Non se subeu ningún ficheiro. Erro descoñecido."
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Sentímolo, esta función aínda non foi implementada."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Non implementada."
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Esta propiedade non pode quedar baldeira."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Non se puido serializar os elementos."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Sen ficheiros escollidos para subir."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleccione tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado: "
@@ -299,129 +308,133 @@ msgstr " importado, "
 msgid " failed."
 msgstr " fallou."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Non se atopou a libreta de enderezos."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta non é a súa axenda."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Non se atopou o contacto."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Enderezo"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organización"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Traballo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Móbil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensaxe"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Paxinador"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Axendas"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Pechar"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar Libretas de enderezos"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova axenda"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ligazón CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: 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 "Eliminar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Solte a foto a subir"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Borrar foto actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar a foto actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Subir unha nova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Escoller foto desde ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalles do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Apodo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introuza apodo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe grupos con comas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor indique un enderezo de correo electrónico válido."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introduza enderezo de correo electrónico"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Correo ao enderezo"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Borrar enderezo de correo electrónico"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Introducir número de teléfono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Borrar número de teléfono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar detalles do enderezo"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Engadir aquí as notas."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Engadir campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Teléfono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Descargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Borrar contacto"
 
@@ -800,7 +791,7 @@ msgstr "Nome a mostrar"
 msgid "Active"
 msgstr "Activo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Gardar"
 
@@ -808,7 +799,7 @@ msgstr "Gardar"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -832,15 +823,15 @@ msgstr "Nome da nova libreta de enderezos"
 msgid "Importing contacts"
 msgstr "Importando contactos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Non ten contactos na súa libreta de enderezos."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Engadir contacto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar libretas de enderezos"
 
@@ -872,6 +863,34 @@ msgstr "Enderezo primario (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova axenda"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 8da22539ae6b0094ce00de717a1f621f66bd47d3..892b9c977f6b7ba697f29add56373186007e9551 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Preferencias"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Xaneiro"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 622cde377c4e9ce14fd8405905d38ccbdcac2a74..2248d0b031b48d0cb45fa23978317908ac78bd9d 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Cuota por omisión"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Borrar"
diff --git a/l10n/he/contacts.po b/l10n/he/contacts.po
index 08b2d093429bf8e0d4c91703bcfaa5070ad487cf..dca49f889e5fa651d1be867289327917cee50b29 100644
--- a/l10n/he/contacts.po
+++ b/l10n/he/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: he\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 "אירעה שגיאה בעת הוספת איש הקשר."
@@ -32,7 +28,9 @@ msgstr "אירעה שגיאה בעת הוספת איש הקשר."
 msgid "element name is not set."
 msgstr "שם האלמנט לא נקבע."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "מספר מזהה לא נקבע."
 
@@ -56,6 +54,18 @@ msgstr "ניסיון להוספת מאפיין כפול: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "שגיאה בהפעלה או בנטרול פנקס הכתובות."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "אי אפשר לעדכן ספר כתובות ללא שם"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "שגיאה בעדכון פנקס הכתובות."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "לא צוין מזהה"
@@ -169,14 +179,6 @@ msgstr "משהו לא התנהל כצפוי."
 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 "התרשה שגיאה בהעלאת אנשי הקשר לאכסון."
@@ -223,71 +225,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "איש קשר"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -300,129 +309,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "ספר כתובות לא נמצא"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "זהו אינו ספר הכתובות שלך"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "לא ניתן לאתר איש קשר"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "כתובת"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "טלפון"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "ארגון"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "עבודה"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "בית"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "נייד"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "טקסט"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "קולי"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "הודעה"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "פקס"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "וידאו"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "זימונית"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "אינטרנט"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "יבא"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "פנקסי כתובות"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "גרור ושחרר תמונה בשביל להעלות"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "מחק תמונה נוכחית"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "ערוך תמונה נוכחית"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "העלה תמונה חדשה"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "בחר תמונה מ ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "ערוך פרטי שם"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "מחיקה"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "כינוי"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "הכנס כינוי"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "הפרד קבוצות עם פסיקים"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "ערוך קבוצות"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "מועדף"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "אנא הזן כתובת דוא\"ל חוקית"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "הזן כתובת דוא\"ל"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "כתובת"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "מחק כתובת דוא\"ל"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "הכנס מספר טלפון"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "מחק מספר טלפון"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "ראה במפה"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "ערוך פרטי כתובת"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "הוסף הערות כאן."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "הוסף שדה"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "טלפון"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "הערה"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "הורדת איש קשר"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "מחיקת איש קשר"
 
@@ -801,7 +792,7 @@ msgstr "שם התצוגה"
 msgid "Active"
 msgstr "פעיל"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "שמירה"
 
@@ -809,7 +800,7 @@ msgstr "שמירה"
 msgid "Submit"
 msgstr "ביצוע"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -833,15 +824,15 @@ msgstr "שם ספר כתובות החדש"
 msgid "Importing contacts"
 msgstr "מיבא אנשי קשר"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "איך לך אנשי קשר בספר הכתובות"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "הוסף איש קשר"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "הגדר ספרי כתובות"
 
@@ -873,6 +864,34 @@ msgstr "כתובת ראשית"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "הורדה"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "עריכה"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "פנקס כתובות חדש"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index caacbd7897e6385f282c7a8815fc66ef80f67568..9f69d80ad1fab314c3d5884ff6dfe7e5b7010200 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr ""
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "ינואר"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 0e2b48f3e683c27dec2409c5f9b47f9e708a0af6..17af884c073a51afec54f3d80875d68345ba314e 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "מכסת בררת המחדל"
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "מכסה"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "מחיקה"
diff --git a/l10n/hr/contacts.po b/l10n/hr/contacts.po
index 52acf5ffa15ca0db33c7b29c29899922468604dc..a8d9aea13fb0c51bee7a72a2e7f2cb535cfc7de7 100644
--- a/l10n/hr/contacts.po
+++ b/l10n/hr/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Pogreška pri (de)aktivaciji adresara."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
@@ -31,7 +27,9 @@ msgstr "Dogodila se pogreška prilikom dodavanja kontakta."
 msgid "element name is not set."
 msgstr "naziv elementa nije postavljen."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id nije postavljen."
 
@@ -55,6 +53,18 @@ msgstr "Pokušali ste dodati duplo svojstvo:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Pogreška pri (de)aktivaciji adresara."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Pogreška pri ažuriranju adresara."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nema dodijeljenog ID identifikatora"
@@ -168,14 +178,6 @@ msgstr "Nešto je otišlo... krivo..."
 msgid "Error updating contact property."
 msgstr "Pogreška pri ažuriranju svojstva kontakta."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne mogu ažurirati adresar sa praznim nazivom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Pogreška pri ažuriranju adresara."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Pogreška pri slanju kontakata."
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresar nije pronađen."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt ne postoji."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobitel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Glasovno"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Poruka"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Uvezi"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresari"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguracija Adresara"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Novi adresar"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav poveznica"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Preuzimanje"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: 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 "Obriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Dovucite fotografiju za slanje"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Uredi trenutnu sliku"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Uredi detalje imena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Unesi nadimank"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupe"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Uredi grupe"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferirano"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Unesi email adresu"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Unesi broj telefona"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Prikaži na karti"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Uredi detalje adrese"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Dodaj bilješke ovdje."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Bilješka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Preuzmi kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Izbriši kontakt"
 
@@ -800,7 +791,7 @@ msgstr "Prikazani naziv"
 msgid "Active"
 msgstr "Aktivno"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Spremi"
 
@@ -808,7 +799,7 @@ msgstr "Spremi"
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Prekini"
 
@@ -832,15 +823,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Preuzimanje"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Novi adresar"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 48308caf0559b3dba87dcb2305fa8c5a8b86b3b5..bfd1c9f19b9d61a8deaa4f923cfa1bf401467f83 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Siječanj"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index d853ac5b27fc348d3dbb94633b42662a6752014f..01ae9d7ee9f47fe42e47edb1cb6107de0f836619 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "standardni kvota"
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "kvota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/hu_HU/contacts.po b/l10n/hu_HU/contacts.po
index f524421d03a1fd3d47a9751e9ddbf0556a49e6be..5e5420b34dfad5d91a7e846c150bbb638f6fca4d 100644
--- a/l10n/hu_HU/contacts.po
+++ b/l10n/hu_HU/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Címlista (de)aktiválása sikertelen"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Hiba a kapcsolat hozzáadásakor"
@@ -33,7 +29,9 @@ msgstr "Hiba a kapcsolat hozzáadásakor"
 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
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID nincs beállítva"
 
@@ -57,6 +55,18 @@ msgstr "Kísérlet dupla tulajdonság hozzáadására: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Címlista (de)aktiválása sikertelen"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Üres névvel nem frissíthető a címlista"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Hiba a címlista frissítésekor"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nincs ID megadva"
@@ -170,14 +180,6 @@ msgstr "Valami balul sült el."
 msgid "Error updating contact property."
 msgstr "Hiba a kapcsolat-tulajdonság frissítésekor"
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Hiba a címlista frissítésekor"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Hiba a kapcsolatok feltöltésekor"
@@ -224,71 +226,78 @@ msgstr "Nem történt feltöltés. Ismeretlen hiba"
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Sajnáljuk, ez a funkció még nem támogatott"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Nem támogatott"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hiba"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kapcsolat"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ezt a tulajdonságot muszáj kitölteni"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Sorbarakás sikertelen"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát."
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nincs kiválasztva feltöltendő fájl"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő fájl mérete meghaladja a megengedett mértéket"
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Típus kiválasztása"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Eredmény: "
@@ -301,129 +310,133 @@ msgstr "  beimportálva,  "
 msgid " failed."
 msgstr "  sikertelen"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Címlista nem található"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ez nem a te címjegyzéked."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kapcsolat nem található."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Cím"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Szervezet"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Otthoni"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiltelefonszám"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Szöveg"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Hang"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Születésnap"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -443,207 +456,185 @@ msgstr "Import"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Címlisták"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Bezár"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Címlisták beállítása"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Új címlista"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav hivatkozás"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Letöltés"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: 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 "Törlés"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Húzza ide a feltöltendő képet"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Aktuális kép törlése"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Aktuális kép szerkesztése"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Új kép feltöltése"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Kép kiválasztása ownCloud-ból"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Név részleteinek szerkesztése"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Törlés"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Becenév"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Becenév megadása"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Csoportok"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Vesszővel válassza el a csoportokat"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Csoportok szerkesztése"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Előnyben részesített"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Adjon meg érvényes email címet"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Adja meg az email címet"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Postai cím"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Email cím törlése"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Adja meg a telefonszámot"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefonszám törlése"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Megtekintés a térképen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Cím részleteinek szerkesztése"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Megjegyzések"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Mező hozzáadása"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonszám"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Jegyzet"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kapcsolat letöltése"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kapcsolat törlése"
 
@@ -802,7 +793,7 @@ msgstr "Megjelenített név"
 msgid "Active"
 msgstr "Aktív"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Mentés"
 
@@ -810,7 +801,7 @@ msgstr "Mentés"
 msgid "Submit"
 msgstr "Elküld"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -834,15 +825,15 @@ msgstr "Új címlista neve"
 msgid "Importing contacts"
 msgstr "Kapcsolatok importálása"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nincsenek kapcsolatok a címlistában"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Kapcsolat hozzáadása"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Címlisták beállítása"
 
@@ -874,6 +865,34 @@ msgstr "Elsődleges cím"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Letöltés"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Új címlista"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index a40b764ad40b0fae33233c8526dcf7b455909fe2..928cb0189784f6038df90515568c5337bc129c28 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Január"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5a646b0f67d3558efc43ba69f5015700136e36de..47d040cef6aff1d36d1ab2b17ef28ba1ce78e7aa 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Alapértelmezett kvóta"
 msgid "Other"
 msgstr "Egyéb"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Törlés"
diff --git a/l10n/hy/contacts.po b/l10n/hy/contacts.po
index 8916c610f80e635d4b7df48af657c7a77e404b8b..b89ca65c8d824ad39b641552ec96dc843a4e45d1 100644
--- a/l10n/hy/contacts.po
+++ b/l10n/hy/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: hy\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f7c8e7693a4e98cce7cec463ae76c3e8bb6e28f3..bcf3a0d20c7b7ab2ccfb42ef2eed90e36b2ffaa6 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 9538d201b8e2eca2b4472b2c202b48e0887fbe53..1d18d1b9fd09d4e58962ade3347c5c12bdb74b83 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ia/contacts.po b/l10n/ia/contacts.po
index d41fa3c8fa0d7836a3817c5376e4b51d8cb8ea27..30a6e588b420051e48de6e0704b0709e234df8a2 100644
--- a/l10n/ia/contacts.po
+++ b/l10n/ia/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: ia\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 ""
@@ -31,7 +27,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -55,6 +53,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -168,14 +178,6 @@ msgstr ""
 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 ""
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressario non trovate."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Iste non es tu libro de adresses"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contacto non poterea esser legite"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telephono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-posta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Travalio"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Domo"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Anniversario"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressarios"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Nove adressario"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Ligamine CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Discargar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modificar"
-
-#: 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 "Deler"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Deler photo currente"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Modificar photo currente"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Incargar nove photo"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Seliger photo ex ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Pseudonymo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Inserer pseudonymo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Modificar gruppos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferite"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Entrar un adresse de e-posta"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Deler adresse de E-posta"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Entrar un numero de telephono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Deler numero de telephono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Vider in un carta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Adder notas hic"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Adder campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Phono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Discargar contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Deler contacto"
 
@@ -800,7 +791,7 @@ msgstr ""
 msgid "Active"
 msgstr "Active"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salveguardar"
 
@@ -808,7 +799,7 @@ msgstr "Salveguardar"
 msgid "Submit"
 msgstr "Submitter"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -832,15 +823,15 @@ msgstr "Nomine del nove gruppo:"
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Adder adressario"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Discargar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modificar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nove adressario"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index fe4466de6b043f5c0f1bb7624367ce0e944e370b..bd15bf5a904fe3a338d5543dc163c8ceef5fcefd 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 20a6dc619a0df05c0fe081f1d9f312554a13beb2..17d5ea37822ef7f35a261630cadf2ab7757cd550 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Quota predeterminate"
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/id/contacts.po b/l10n/id/contacts.po
index 46c23dd903f54ff56ef6d150daa97bfaa18dc28e..84104f841cce92a81f47a337b1ad2dd817089cbd 100644
--- a/l10n/id/contacts.po
+++ b/l10n/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index dbfdf23312651af0cbba75f93045fcee268e12f7..6245505a80b25fc04286ecd16567c169e3f38de4 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index e33802637fe81132b94bdbf555bc3d12110f7c40..ab9bd7935452051444f0a13009a03fc649ebd771 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Kuota default"
 msgid "Other"
 msgstr "Lain-lain"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Hapus"
diff --git a/l10n/id_ID/contacts.po b/l10n/id_ID/contacts.po
index 0efd77c3ec3f5a81b7c5406c2f58f9c2e350a45a..b7347b2b7de04eeb2eae407a1eadc3796ff7f2da 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 1434c85e1d88aa331549c2416a364aa8ae4ce4f1..0d43d3618c804ec1a51919bb075d0a1cd8f93f2c 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index e28f303b9292ceed9137ffd52fee54b98341a491..c8cf7eb0de4781fc0954e11050682685fc1ebc1e 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index a6d51ee4f5ea642254277ee1bb23f0558b95df8e..7a2687c796967d8b4a591f895e1676e4cddb22f6 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-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Errore nel (dis)attivare la rubrica."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Si è verificato un errore nell'aggiunta del contatto."
@@ -33,7 +29,9 @@ msgstr "Si è verificato un errore nell'aggiunta del contatto."
 msgid "element name is not set."
 msgstr "il nome dell'elemento non è impostato."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID non impostato."
 
@@ -57,6 +55,18 @@ msgstr "P"
 msgid "Error adding contact property: "
 msgstr "Errore durante l'aggiunta della proprietà del contatto: "
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Errore nel (dis)attivare la rubrica."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Impossibile aggiornare una rubrica senza nome."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Errore durante l'aggiornamento della rubrica."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nessun ID fornito"
@@ -170,14 +180,6 @@ msgstr "Qualcosa è andato storto. "
 msgid "Error updating contact property."
 msgstr "Errore durante l'aggiornamento della proprietà del contatto."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Impossibile aggiornare una rubrica senza nome."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Errore durante l'aggiornamento della rubrica."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Errore di invio dei contatti in archivio."
@@ -224,71 +226,78 @@ msgstr "Nessun file è stato inviato. Errore sconosciuto"
 msgid "Contacts"
 msgstr "Contatti"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Siamo spiacenti, questa funzionalità non è stata ancora implementata"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Non implementata"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Impossibile ottenere un indirizzo valido."
 
-#: 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Errore"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contatto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nuovo"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Questa proprietà non può essere vuota."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Impossibile serializzare gli elementi."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 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:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Modifica il nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nessun file selezionato per l'invio"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleziona il tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Risultato: "
@@ -301,129 +310,133 @@ msgstr " importato, "
 msgid " failed."
 msgstr " non riuscito."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Rubrica non trovata."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Questa non è la tua rubrica."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Il contatto non può essere trovato."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Indirizzo"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefono"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Lavoro"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Testo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Lavoro"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Chiama"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Client"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Corriere"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Festività"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idee"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Viaggio"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Anniversario"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Riunione"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Altro"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Personale"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Progetti"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Domande"
 
@@ -443,207 +456,185 @@ msgstr "Importa"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Rubriche"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Contatto successivo in elenco"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Contatto precedente in elenco"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Espandi/Contrai la rubrica corrente"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Rubrica successiva/precedente"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Aggiorna l'elenco dei contatti"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Aggiungi una nuova rubrica"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Elimina il contatto corrente"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configura rubrica"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nuova rubrica"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Link CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Scarica"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Modifica"
-
-#: 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 "Elimina"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Rilascia una foto da inviare"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Elimina la foto corrente"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Modifica la foto corrente"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Invia una nuova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Seleziona la foto da ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Modifica dettagli del nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Elimina"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Pseudonimo"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Inserisci pseudonimo"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Sito web"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Vai al sito web"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "gg-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separa i gruppi con virgole"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Modifica gruppi"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferito"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Specifica un indirizzo email valido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Inserisci indirizzo email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Invia per email"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Elimina l'indirizzo email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Inserisci il numero di telefono"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Elimina il numero di telefono"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Modifica dettagli dell'indirizzo"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Aggiungi qui le note."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Aggiungi campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefono"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Scarica contatto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Elimina contatto"
 
@@ -802,7 +793,7 @@ msgstr "Nome visualizzato"
 msgid "Active"
 msgstr "Attiva"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salva"
 
@@ -810,7 +801,7 @@ msgstr "Salva"
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -834,15 +825,15 @@ msgstr "Nome della nuova rubrica"
 msgid "Importing contacts"
 msgstr "Importazione contatti"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Non hai contatti nella rubrica."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Aggiungi contatto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configura rubriche"
 
@@ -874,6 +865,34 @@ msgstr "Indirizzo principale (Kontact e altri)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
-msgstr "Collegamento(i) cartella vCard sola lettura"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Scarica"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Modifica"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nuova rubrica"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 034071bef13ee6f4960d3593f3978a10506dfa36..95cfeb14f432c9534c12dcdd1e019aa564c0932f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-08-01 02:01+0200\n"
-"PO-Revision-Date: 2012-07-31 21:17+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "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"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr "Errore di caricamento dello script per le impostazioni"
-
 #: js/js.js:573
 msgid "January"
 msgstr "Gennaio"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 475f87fd9203e1c33523a30229626a45788bf0a2..c31a629ac47c8f9383385de281fc1b2671fb8478 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 05:39+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -208,7 +208,7 @@ msgstr "Quota predefinita"
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "SubAdmin"
 
@@ -216,10 +216,6 @@ msgstr "SubAdmin"
 msgid "Quota"
 msgstr "Quote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "SubAdmin per..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index 1f8cbc10ecf8574a753c10b85ae6db13a1c23a3b..687698a3cda157117fcb27eba6cb19765d58445a 100644
--- a/l10n/ja_JP/contacts.po
+++ b/l10n/ja_JP/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\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 "連絡先の追加でエラーが発生しました。"
@@ -30,7 +26,9 @@ msgstr "連絡先の追加でエラーが発生しました。"
 msgid "element name is not set."
 msgstr "要素名が設定されていません。"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "idが設定されていません。"
 
@@ -52,7 +50,19 @@ msgstr "重複する属性を追加: "
 
 #: ajax/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "コンタクト属性の追加エラー: "
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "アドレスブックの有効/無効化に失敗しました。"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "空白の名前でアドレスブックを更新することはできません。"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "アドレスブックの更新に失敗しました。"
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -167,14 +177,6 @@ msgstr ""
 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 "ストレージへの連絡先のアップロードエラー。"
@@ -221,71 +223,78 @@ msgstr "ファイルは何もアップロードされていません。不明な
 msgid "Contacts"
 msgstr "連絡先"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "申し訳ありません。この機能はまだ実装されていません"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "未実装"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "エラー"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "連絡先"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
-msgstr ""
+msgstr "新規"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
-msgstr ""
+msgstr "新しいコンタクト"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "この属性は空にできません。"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "要素をシリアライズできませんでした。"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "名前を編集"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "アップロードするファイルが選択されていません。"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "タイプを選択"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "結果: "
@@ -298,131 +307,135 @@ msgstr " をインポート、 "
 msgid " failed."
 msgstr " は失敗しました。"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "アドレスブックが見つかりませんでした。"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "これはあなたの電話帳ではありません。"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "連絡先を見つける事ができません。"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "住所"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "電話番号"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "メールアドレス"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "所属"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "勤務先"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "住居"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "携帯電話"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "TTY TDD"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "音声番号"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "FAX"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "テレビ電話"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "ポケベル"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "インターネット"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "誕生日"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "ビジネス"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "顧客"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
-msgstr ""
+msgstr "運送会社"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "休日"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "アイデア"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "旅行"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
-msgstr ""
+msgstr "記念祭"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "打ち合わせ"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "個人"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "プロジェクト"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "質問"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -438,209 +451,187 @@ msgstr "インポート"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "電話帳"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "閉じる"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "キーボードショートカット"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
-msgstr ""
+msgstr "ナビゲーション"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
-msgstr ""
+msgstr "リスト内の次のコンタクト"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
-msgstr ""
+msgstr "リスト内の前のコンタクト"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "新しいコンタクトを追加"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "新しいアドレスブックを追加"
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "CardDAVリンク"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "ダウンロード"
+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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "写真をドロップしてアップロード"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "現在の写真を削除"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "現在の写真を編集"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "新しい写真をアップロード"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "ownCloudから写真を選択"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "名前の詳細を編集"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "削除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "ニックネームを入力"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "ウェブサイト"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "コンマでグループを分割"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "グループを編集"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "推奨"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "連絡先を追加"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "メールアドレスを入力"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "アドレスへメールを送る"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "メールアドレスを削除"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "電話番号を入力"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "電話番号を削除"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "地図で表示"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "住所の詳細を編集"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "ここにメモを追加。"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "項目を追加"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "電話番号"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "メモ"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "連絡先のダウンロード"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "連絡先の削除"
 
@@ -696,7 +687,7 @@ msgstr "郵便番号"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "郵便番号"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -799,7 +790,7 @@ msgstr "表示名"
 msgid "Active"
 msgstr "アクティブ"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "保存"
 
@@ -807,7 +798,7 @@ msgstr "保存"
 msgid "Submit"
 msgstr "送信"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "取り消し"
 
@@ -831,15 +822,15 @@ msgstr "新しいアドレスブックの名前"
 msgid "Importing contacts"
 msgstr "コンタクトをインポート"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "アドレスブックに連絡先が登録されていません。"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "連絡先を追加"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "アドレス帳を設定"
 
@@ -849,7 +840,7 @@ msgstr ""
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "名前を入力"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
@@ -871,6 +862,34 @@ msgstr "プライマリアドレス(Kontact 他)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "ダウンロード"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "編集"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新規電話帳"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 6aa6c326c5bc09eff3866618506c148e4dfe510a..18c7f43a644c50fb0af5fc64469861d7a20b7226 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "1月"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 1bc2d2cc7f62ed279e4333e36b1332ff0c33f94c..d489889001268efe25796fb85883ce37c1474f1d 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -36,7 +36,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"
@@ -60,7 +60,7 @@ msgstr "Japanese (日本語)"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "セキュリティ警告"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -202,7 +202,7 @@ msgstr "デフォルトのクォータサイズ"
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "クオータ"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "削除"
diff --git a/l10n/ko/contacts.po b/l10n/ko/contacts.po
index 3d9e441fab3656461b575306fdef0fb479277d56..0bf8fd46046cc9b6429dc500e5fa431dccf64327 100644
--- a/l10n/ko/contacts.po
+++ b/l10n/ko/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\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 "연락처를 추가하는 중 오류가 발생하였습니다."
@@ -31,7 +27,9 @@ msgstr "연락처를 추가하는 중 오류가 발생하였습니다."
 msgid "element name is not set."
 msgstr "element 이름이 설정되지 않았습니다."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "아이디가 설정되어 있지 않습니다. "
 
@@ -55,6 +53,18 @@ msgstr "중복 속성 추가 시도: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "주소록을 (비)활성화하는 데 실패했습니다."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. "
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "주소록을 업데이트할 수 없습니다."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "제공되는 아이디 없음"
@@ -168,14 +178,6 @@ msgstr ""
 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 "스토리지 에러 업로드 연락처."
@@ -222,71 +224,78 @@ msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류."
 msgid "Contacts"
 msgstr "연락처"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "죄송합니다. 이 기능은 아직 구현되지 않았습니다. "
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "구현되지 않음"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "오류"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "연락처"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "요소를 직렬화 할 수 없습니다."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty'가 문서형식이 없이 불려왔습니다. bugs.owncloud.org에 보고해주세요. "
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "이름 편집"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "업로드를 위한 파일이 선택되지 않았습니다. "
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "유형 선택"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "결과:"
@@ -299,129 +308,133 @@ msgstr "불러오기,"
 msgid " failed."
 msgstr "실패."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "주소록을 찾을 수 없습니다."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "내 주소록이 아닙니다."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "연락처를 찾을 수 없습니다."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "주소"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "전화 번호"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "전자 우편"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "조직"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "직장"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "자택"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "휴대폰"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "문자 번호"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "음성 번호"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "메세지"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "팩스 번호"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "영상 번호"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "호출기"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "인터넷"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "생일"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "입력"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "주소록"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "닫기"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "CardDav 링크"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Drop photo to upload"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "현재 사진 삭제"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "현재 사진 편집"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "새로운 사진 업로드"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "ownCloud에서 사진 선택"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "이름 세부사항을 편집합니다. "
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "삭제"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "별명"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "별명 입력"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "일-월-년"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "쉼표로 그룹 구분"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "그룹 편집"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "선호함"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "올바른 이메일 주소를 입력하세요."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "이메일 주소 입력"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "이메일 주소 삭제"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "전화번호 입력"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "전화번호 삭제"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "지도에서 보기"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "상세 주소 수정"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "여기에 노트 추가."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "파일 추가"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "전화 번호"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "노트"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "연락처 다운로드"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "연락처 삭제"
 
@@ -800,7 +791,7 @@ msgstr "표시 이름"
 msgid "Active"
 msgstr "활성"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "저장"
 
@@ -808,7 +799,7 @@ msgstr "저장"
 msgid "Submit"
 msgstr "보내기"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "취소"
 
@@ -832,15 +823,15 @@ msgstr "새 주소록 이름"
 msgid "Importing contacts"
 msgstr "연락처 입력"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "당신의 주소록에는 연락처가 없습니다. "
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "연락처 추가"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "주소록 구성"
 
@@ -872,6 +863,34 @@ msgstr "기본 주소 (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "다운로드"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "편집"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "새 주소록"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 948625d1cced0970786f45cc16db6e04bad90051..aaed23a766f79ea8e6b82e223c213084d903fd78 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "1월"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 51dbed056b427263b69f77cfe9ee15ee880b0cb3..80fd886732154be9206b2634623784db4b291758 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "기본 할당량"
 msgid "Other"
 msgstr "다른"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "할당량"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "삭제"
diff --git a/l10n/lb/contacts.po b/l10n/lb/contacts.po
index fe4a8a044e5e5095be7cb48a0de024edfa6ac8c7..f6717af86fe2bd9e351de253f6cabebac3e25004 100644
--- a/l10n/lb/contacts.po
+++ b/l10n/lb/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Fehler beim bäisetzen vun engem Kontakt."
@@ -30,7 +26,9 @@ msgstr "Fehler beim bäisetzen vun engem Kontakt."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID ass net gesat."
 
@@ -54,6 +52,18 @@ msgstr "Probéieren duebel Proprietéit bäi ze setzen:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fehler beim (de)aktivéieren vum Adressbuch."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fehler beim updaten vum Adressbuch."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Keng ID uginn"
@@ -167,14 +177,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Fehler beim updaten vun der Kontakt Proprietéit."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fehler beim updaten vum Adressbuch."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fehler"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat: "
@@ -298,129 +307,133 @@ msgstr " importéiert, "
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adressbuch net fonnt."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dat do ass net däin Adressbuch."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Konnt den Kontakt net fannen."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon's Nummer"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Firma"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Aarbecht"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Doheem"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "GSM"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voice"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Gebuertsdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressbicher "
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zoumaachen"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adressbicher konfigureiren"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Neit Adressbuch"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editéieren"
-
-#: 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 "Läschen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Läschen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Spëtznumm"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Gëff e Spëtznumm an"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Gruppen editéieren"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Telefonsnummer aginn"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefonsnummer läschen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Op da Kaart uweisen"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Adress Detailer editéieren"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Note"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kontakt eroflueden"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kontakt läschen"
 
@@ -799,7 +790,7 @@ msgstr "Ugewisene Numm"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Späicheren"
 
@@ -807,7 +798,7 @@ msgstr "Späicheren"
 msgid "Submit"
 msgstr "Fortschécken"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Ofbriechen"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editéieren"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Neit Adressbuch"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 04a5957160afe8ecf9174d83a8928c975d3c05b1..992723898f7169b20dd582792d005877f18da046 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 705509ed4d490e359c092d1108f2454ee5748c97..0d5bf0ad10d52a0dab8668a3e89094bbb9ad331c 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr "Standard Quota"
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Läschen"
diff --git a/l10n/lt_LT/contacts.po b/l10n/lt_LT/contacts.po
index c6f544cbda57a01e6ad8e47f7ced978dc4edb4ae..b63e058e0e29741c3b1a1ec721c9e52c62559ab8 100644
--- a/l10n/lt_LT/contacts.po
+++ b/l10n/lt_LT/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Klaida (de)aktyvuojant adresų knygą."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Pridedant kontaktą įvyko klaida."
@@ -30,7 +26,9 @@ msgstr "Pridedant kontaktą įvyko klaida."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Klaida (de)aktyvuojant adresų knygą."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 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 ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontaktas"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Nerasta adresų knyga."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Tai ne jūsų adresų knygelė."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontaktas nerastas"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresas"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonas"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "El. paštas"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Darbo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Namų"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Žinučių"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Balso"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Žinutė"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faksas"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vaizdo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pranešimų gaviklis"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internetas"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Gimtadienis"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresų knygos"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigūruoti adresų knygas"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nauja adresų knyga"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV nuoroda"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Atsisiųsti"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Keisti"
-
-#: 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 "Trinti"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Trinti"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Slapyvardis"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonas"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Atsisųsti kontaktą"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Ištrinti kontaktą"
 
@@ -799,7 +790,7 @@ msgstr "Rodomas vardas"
 msgid "Active"
 msgstr "Aktyvus"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Išsaugoti"
 
@@ -807,7 +798,7 @@ msgstr "Išsaugoti"
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Atsisiųsti"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Keisti"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nauja adresų knyga"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 3dfbbfaf40a510e2c0fce9073185abfead9528e3..60b338d51ccf4e89463c376e3d01fdf03da15efb 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Sausis"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 0986258c8b7e164ba7c6af3a08ac8a3394f0d8c6..d0f1fd44886a5ccca98b5c3f9967abe3557f2779 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr "Numatytoji kvota"
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Limitas"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Ištrinti"
diff --git a/l10n/lv/contacts.po b/l10n/lv/contacts.po
index 0b80baf9b44fe95e47eeda2c3b5141b1a77494f4..c47721670c7322eb7f45a758534ee1a2da0ffd44 100644
--- a/l10n/lv/contacts.po
+++ b/l10n/lv/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 0c20b3c465125ddcd5eb43baeaea1dea00ecf029..a9c0fffbecb85384510f140a99dec8d519de5125 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index fbc7ad0283ce71a25b1565e9c510668dd71ef754..03f11cf4f6437494c50e57cc7b54a2cfd1a022a7 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr "Apjoms pēc noklusējuma"
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Apjoms"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Izdzēst"
diff --git a/l10n/mk/contacts.po b/l10n/mk/contacts.po
index 3af06736fa5f78191139db3e2c42ab0caa96c56c..4b32b8a1e6b261eae5556036d7e50f230590b550 100644
--- a/l10n/mk/contacts.po
+++ b/l10n/mk/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 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 "Имаше грешка при додавање на контактот."
@@ -31,7 +27,9 @@ msgstr "Имаше грешка при додавање на контактот.
 msgid "element name is not set."
 msgstr "име за елементот не е поставена."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ид не е поставено."
 
@@ -55,6 +53,18 @@ msgstr "Се обидовте да внесете дупликат вредно
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Грешка (де)активирање на адресарот."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Неможе да се ажурира адресар со празно име."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Грешка при ажурирање на адресарот."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Нема доставено ИД"
@@ -168,14 +178,6 @@ msgstr "Нешто се расипа."
 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 "Грешка во снимање на контактите на диск."
@@ -222,71 +224,78 @@ msgstr "Ниту еден фајл не се вчита. Непозната гр
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Жалам, оваа функционалност уште не е имплементирана"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Не е имплементирано"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Грешка"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Својството не смее да биде празно."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Не може да се серијализираат елементите."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' повикан без тип на аргументот. Пријавете грешка/проблем на bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Уреди го името"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ниту еден фајл не е избран за вчитување."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Одбери тип"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Резултат: "
@@ -299,129 +308,133 @@ msgstr "увезено,"
 msgid " failed."
 msgstr "неуспешно."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Адресарот не е најден."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ова не е во Вашиот адресар."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Контактот неможе да биде најден."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Е-пошта"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Работа"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Дома"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Порака"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Роденден"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "Внеси"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Адресари"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Затвои"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Врска за CardDav"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Довлечкај фотографија за да се подигне"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Избриши моментална фотографија"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Уреди моментална фотографија"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Подигни нова фотографија"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Изберете фотографија од ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Прилагоден формат, кратко име, цело име, обратно или обратно со запирка"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Уреди детали за име"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Избриши"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Прекар"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Внеси прекар"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Одвоете ги групите со запирка"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Уреди групи"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Претпочитано"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Ве молам внесете правилна адреса за е-пошта."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Внесете е-пошта"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Прати порака до адреса"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Избриши адреса за е-пошта"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Внесете телефонски број"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Избриши телефонски број"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Погледајте на мапа"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Уреди детали за адреса"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Внесете забелешки тука."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Додади поле"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Забелешка"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Преземи го контактот"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Избриши го контактот"
 
@@ -800,7 +791,7 @@ msgstr "Прикажано име"
 msgid "Active"
 msgstr "Активно"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Сними"
 
@@ -808,7 +799,7 @@ msgstr "Сними"
 msgid "Submit"
 msgstr "Прати"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -832,15 +823,15 @@ msgstr "Име на новиот адресар"
 msgid "Importing contacts"
 msgstr "Внесување контакти"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Немате контакти во Вашиот адресар."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Додади контакт"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Уреди адресари"
 
@@ -872,6 +863,34 @@ msgstr "Примарна адреса"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Преземи"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нов адресар"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 679185b78f82cfe122f15fc3ee50e949a48a4706..845e2aa68c77c9fa8aa86f521c08191f52b59fd7 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Јануари"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index ef930d96598d60bbe6df922144db950ea9357ed7..45521a471d7e688a4a219bc1e425c47bc9cc48e8 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Предефинирана квота"
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Избриши"
diff --git a/l10n/ms_MY/contacts.po b/l10n/ms_MY/contacts.po
index 1bab894cc66f9b01b473a548fb9a2f255817b007..0bb905bda62647e23095e00154f04c8c7d0c98c9 100644
--- a/l10n/ms_MY/contacts.po
+++ b/l10n/ms_MY/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ralat nyahaktif buku alamat."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Terdapat masalah menambah maklumat."
@@ -33,7 +29,9 @@ msgstr "Terdapat masalah menambah maklumat."
 msgid "element name is not set."
 msgstr "nama elemen tidak ditetapkan."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID tidak ditetapkan."
 
@@ -57,6 +55,18 @@ msgstr "Cuba untuk letak nilai duplikasi:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ralat nyahaktif buku alamat."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Masalah mengemaskini buku alamat."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "tiada ID diberi"
@@ -170,14 +180,6 @@ msgstr "Sesuatu tidak betul."
 msgid "Error updating contact property."
 msgstr "Masalah mengemaskini maklumat."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Tidak boleh kemaskini buku alamat dengan nama yang kosong."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Masalah mengemaskini buku alamat."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Ralat memuatnaik senarai kenalan."
@@ -224,71 +226,78 @@ msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 msgid "Contacts"
 msgstr "Hubungan-hubungan"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Maaf, fungsi ini masih belum boleh diguna lagi"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Tidak digunakan"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ralat"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Hubungan"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Nilai ini tidak boleh kosong."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Tidak boleh menggabungkan elemen."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' dipanggil tanpa argumen taip. Sila maklumkan di bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Ubah nama"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Tiada fail dipilih untuk muatnaik."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang ingin dimuatnaik melebihi saiz yang dibenarkan."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "PIlih jenis"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Hasil: "
@@ -301,129 +310,133 @@ msgstr " import, "
 msgid " failed."
 msgstr " gagal."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Buku alamat tidak dijumpai."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ini bukan buku alamat anda."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Hubungan tidak dapat ditemui"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Alamat"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Emel"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisasi"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Kerja"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Rumah"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mudah alih"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Teks"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Suara"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mesej"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Alat Kelui"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Hari lahir"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -443,207 +456,185 @@ msgstr "Import"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Senarai Buku Alamat"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Tutup"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurasi Buku Alamat"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Buku Alamat Baru"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Sambungan CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Muat naik"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Sunting"
-
-#: 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 "Padam"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Letak foto disini untuk muatnaik"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Padam foto semasa"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Ubah foto semasa"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Muatnaik foto baru"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Pilih foto dari ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Format bebas, Nama pendek, Nama penuh, Unduran dengan koma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Ubah butiran nama"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Padam"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Nama Samaran"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Masukkan nama samaran"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Asingkan kumpulan dengan koma"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Ubah kumpulan"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Pilihan"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Berikan alamat emel yang sah."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Masukkan alamat emel"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Hantar ke alamat"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Padam alamat emel"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Masukkan nombor telefon"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Padam nombor telefon"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Lihat pada peta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Ubah butiran alamat"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Letak nota disini."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Letak ruangan"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Muat turun hubungan"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Padam hubungan"
 
@@ -802,7 +793,7 @@ msgstr "Paparan nama"
 msgid "Active"
 msgstr "Aktif"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Simpan"
 
@@ -810,7 +801,7 @@ msgstr "Simpan"
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Batal"
 
@@ -834,15 +825,15 @@ msgstr "Nama buku alamat"
 msgid "Importing contacts"
 msgstr "Import senarai kenalan"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Anda tidak mempunyai sebarang kenalan didalam buku alamat."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Letak kenalan"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurasi buku alamat"
 
@@ -874,6 +865,34 @@ msgstr "Alamat utama"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Muat naik"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Sunting"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Buku Alamat Baru"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index ee0e7eeea28b7117a72700168ddc9516e33ac178..468102d63d93c8b7aa9a3e4c0d3b06df49f86c25 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januari"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index ac9829814869b4af13b12e0e36d4987886f33fd8..ef9fb19e53f89efdccd16bb90c8952769df0de0c 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -205,7 +205,7 @@ msgstr "Kuota Lalai"
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -213,10 +213,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kuota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/nb_NO/contacts.po b/l10n/nb_NO/contacts.po
index 291e1afa10a2ccff8c093cf5a96bcc1c9f85fa18..c3a53c33804bd2a1cfbf3bc90a530a4a544b73bc 100644
--- a/l10n/nb_NO/contacts.po
+++ b/l10n/nb_NO/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Et problem oppsto med å (de)aktivere adresseboken."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Et problem oppsto med å legge til kontakten."
@@ -33,7 +29,9 @@ msgstr "Et problem oppsto med å legge til kontakten."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id er ikke satt."
 
@@ -57,6 +55,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Et problem oppsto med å (de)aktivere adresseboken."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan ikke oppdatere adressebøker uten navn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Et problem oppsto med å oppdatere adresseboken."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Ingen ID angitt"
@@ -170,14 +180,6 @@ msgstr "Noe gikk fryktelig galt."
 msgid "Error updating contact property."
 msgstr "Et problem oppsto med å legge til kontaktfeltet."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan ikke oppdatere adressebøker uten navn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Et problem oppsto med å oppdatere adresseboken."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
@@ -224,71 +226,78 @@ msgstr "Ingen filer ble lastet opp. Ukjent feil."
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Feil"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Endre navn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Ingen filer valgt for opplasting."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filen du prøver å laste opp er for stor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Velg type"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -301,129 +310,133 @@ msgstr "importert,"
 msgid " failed."
 msgstr "feilet."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresseboken ble ikke funnet."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dette er ikke dine adressebok."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakten ble ikke funnet."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hjem"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Svarer"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Melding"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internett"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -443,207 +456,185 @@ msgstr "Importer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Lukk"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurer adressebok"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV-lenke"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Hent ned"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Rediger"
-
-#: 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 "Slett"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Dra bilder hit for å laste opp"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Fjern nåværende bilde"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Rediger nåværende bilde"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Last opp nytt bilde"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Velg bilde fra ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Endre detaljer rundt navn"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Skriv inn kallenavn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Skill gruppene med komma"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Endre grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Vennligst angi en gyldig e-postadresse."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Skriv inn e-postadresse"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Send e-post til adresse"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Fjern e-postadresse"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Skriv inn telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Fjern telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Se på kart"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Endre detaljer rundt adresse"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Legg inn notater her."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Legg til felt"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notat"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Hend ned kontakten"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -802,7 +793,7 @@ msgstr "Visningsnavn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Lagre"
 
@@ -810,7 +801,7 @@ msgstr "Lagre"
 msgid "Submit"
 msgstr "Lagre"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -834,15 +825,15 @@ msgstr "Navn på ny adressebok"
 msgid "Importing contacts"
 msgstr "Importerer kontakter"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du har ingen kontakter i din adressebok"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Ny kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurer adressebøker"
 
@@ -874,6 +865,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Hent ned"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index b22e6e9fc1e64453c9f03fc2034627464eeecf91..010ea33704116bd37ab9953630f758ac18df4d26 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januar"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index f423532a21e4a7ad705f2a3ff598336c369f40b4..fbf111c4d387e47fd3a87155f3b0b2da84cc7712 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -206,7 +206,7 @@ msgstr "Standard Kvote"
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -214,10 +214,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index a67a57368905baa0b47de12995d3ae7793f6bc8b..5c574cdc68352963ea6c15fb6c4c8f5dbe7a556b 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: 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:47
 msgid "There was an error adding the contact."
 msgstr "Er was een fout bij het toevoegen van het contact."
@@ -34,7 +30,9 @@ msgstr "Er was een fout bij het toevoegen van het contact."
 msgid "element name is not set."
 msgstr "onderdeel naam is niet opgegeven."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id is niet ingesteld."
 
@@ -58,6 +56,18 @@ msgstr "Eigenschap bestaat al: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fout bij het (de)activeren van het adresboek."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan adresboek zonder naam niet wijzigen"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fout bij het updaten van het adresboek."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Geen ID opgegeven"
@@ -171,14 +181,6 @@ msgstr "Er ging iets totaal verkeerd. "
 msgid "Error updating contact property."
 msgstr "Fout bij het updaten van de contacteigenschap."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan adresboek zonder naam niet wijzigen"
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fout bij het updaten van het adresboek."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fout bij opslaan van contacten."
@@ -225,71 +227,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contacten"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -302,129 +311,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresboek niet gevonden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dit is niet uw adresboek."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contact kon niet worden gevonden."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisatie"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Werk"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Thuis"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Stem"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pieper"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importeer"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresboeken"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Instellen adresboeken"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nieuw Adresboek"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Download"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Bewerken"
-
-#: 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 "Verwijderen"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Verwijder foto uit upload"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Verwijdere huidige foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Wijzig huidige foto"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Upload nieuwe foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecteer foto uit ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Wijzig naam gegevens"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Roepnaam"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Voer roepnaam in"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Gebruik komma bij meerder groepen"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Wijzig groepen"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Voorkeur"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Geef een geldig email adres op."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Voer email adres in"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Mail naar adres"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Verwijder email adres"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Voer telefoonnummer in"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Verwijdere telefoonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Bekijk op een kaart"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Wijzig adres gegevens"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Voeg notitie toe"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Voeg veld toe"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefoon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notitie"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Download contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Verwijder contact"
 
@@ -803,7 +794,7 @@ msgstr "Weergavenaam"
 msgid "Active"
 msgstr "Actief"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Opslaan"
 
@@ -811,7 +802,7 @@ msgstr "Opslaan"
 msgid "Submit"
 msgstr "Opslaan"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Anuleren"
 
@@ -835,15 +826,15 @@ msgstr "Naam van nieuw adresboek"
 msgid "Importing contacts"
 msgstr "Importeren van contacten"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Je hebt geen contacten in je adresboek"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Contactpersoon toevoegen"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Bewerken adresboeken"
 
@@ -875,6 +866,34 @@ msgstr "Standaardadres"
 msgid "iOS/OS X"
 msgstr "IOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Download"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Bewerken"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nieuw Adresboek"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 587342c1fcabfac71d2de69a69a1224008268482..cdbdada846a561e1c2f08c669c4b5e95d8f952b9 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Januari"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index daccd5ac07450366d7d2dca40de08de6570e6065..2f18790514577afc5c601a9ef6b64168a6331462 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -207,7 +207,7 @@ msgstr "Standaard limiet"
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -215,10 +215,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Limieten"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "verwijderen"
diff --git a/l10n/nn_NO/contacts.po b/l10n/nn_NO/contacts.po
index ceeea1a2bd0984c01783fd673d6c99817e7c1dc9..77dbe1e05a2d8ba378968bf907457bb9c72c7923 100644
--- a/l10n/nn_NO/contacts.po
+++ b/l10n/nn_NO/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: 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:47
 msgid "There was an error adding the contact."
 msgstr "Det kom ei feilmelding då kontakta vart lagt til."
@@ -31,7 +27,9 @@ msgstr "Det kom ei feilmelding då kontakta vart lagt til."
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -55,6 +53,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ein feil oppstod ved (de)aktivering av adressebok."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eit problem oppstod ved å oppdatere adresseboka."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -168,14 +178,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Eit problem oppstod ved å endre kontaktfeltet."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eit problem oppstod ved å oppdatere adresseboka."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kotaktar"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Dette er ikkje di adressebok."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Fann ikkje kontakten."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Epost"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbeid"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Heime"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Tale"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Bursdag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressebøker"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Ny adressebok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav lenkje"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Last ned"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Endra"
-
-#: 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 "Slett"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Føretrekt"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefonnummer"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Last ned kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -800,7 +791,7 @@ msgstr "Visningsnamn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Lagre"
 
@@ -808,7 +799,7 @@ msgstr "Lagre"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Kanseller"
 
@@ -832,15 +823,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Last ned"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Endra"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 6374219085a5d1f7ae7757489f23bcfd12265f3e..707892db95849db0fa948c038d579ad472d5eb3f 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 99195922f1cd7edee17d14a20a2af21a04509b99..72badad24b84eb577ed5e53a9f6670a105fdd030 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvote"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/pl/contacts.po b/l10n/pl/contacts.po
index c6c1bf1a2d0bda58fafb9321cd778e9181638c2a..d46b2f8b6ddc1409ab4fa5119613dc80ee36b2b9 100644
--- a/l10n/pl/contacts.po
+++ b/l10n/pl/contacts.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +21,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Błąd (de)aktywowania książki adresowej."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Wystąpił błąd podczas dodawania kontaktu."
@@ -33,13 +29,15 @@ msgstr "Wystąpił błąd podczas dodawania kontaktu."
 msgid "element name is not set."
 msgstr "nazwa elementu nie jest ustawiona."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 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 ""
+msgstr "Nie można parsować kontaktu:"
 
 #: ajax/addproperty.php:56
 msgid "Cannot add empty property."
@@ -55,7 +53,19 @@ msgstr "Próba dodania z duplikowanej właściwości:"
 
 #: ajax/addproperty.php:144
 msgid "Error adding contact property: "
-msgstr ""
+msgstr "Błąd przy dodawaniu właściwości kontaktu:"
+
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Błąd (de)aktywowania książki adresowej."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nie można zaktualizować książki adresowej z pustą nazwą."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Błąd uaktualniania książki adresowej."
 
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
@@ -170,14 +180,6 @@ msgstr "Gdyby coś poszło FUBAR."
 msgid "Error updating contact property."
 msgstr "Błąd uaktualniania elementu."
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Błąd uaktualniania książki adresowej."
-
 #: 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."
@@ -224,71 +226,78 @@ msgstr "Plik nie został załadowany. Nieznany błąd"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Niestety, ta funkcja nie została jeszcze zaimplementowana"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Nie wdrożono"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Błąd"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
-msgstr ""
+msgstr "Nowy"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
-msgstr ""
+msgstr "Nowy kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ta właściwość nie może być pusta."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Nie można serializować elementów."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty' wywołana bez argumentu typu. Proszę raportuj na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Zmień nazwę"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Żadne pliki nie zostały zaznaczone do wysłania."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Plik, który próbujesz wysłać przekracza maksymalny rozmiar pliku przekazywania na tym serwerze."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Wybierz typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Wynik: "
@@ -301,131 +310,135 @@ msgstr " importowane, "
 msgid " failed."
 msgstr "  nie powiodło się."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Nie znaleziono książki adresowej"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "To nie jest Twoja książka adresowa."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Nie można odnaleźć kontaktu."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacja"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Praca"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Dom"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Komórka"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Połączenie tekstowe"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Połączenie głosowe"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Wiadomość"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Połączenie wideo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Urodziny"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
-msgstr ""
+msgstr "Biznesowe"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
-msgstr ""
+msgstr "Klienci"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
-msgstr ""
+msgstr "Święta"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
-msgstr ""
+msgstr "Pomysły"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
-msgstr ""
+msgstr "Podróż"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
-msgstr ""
+msgstr "Spotkanie"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
-msgstr ""
+msgstr "Inne"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
-msgstr ""
+msgstr "Osobiste"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
-msgstr ""
+msgstr "Projekty"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
-msgstr ""
+msgstr "Pytania"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -441,209 +454,187 @@ msgstr "Import"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Ustawienia"
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Książki adresowe"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zamknij"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Skróty klawiatury"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
-msgstr ""
+msgstr "Nawigacja"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
-msgstr ""
+msgstr "Następny kontakt na liście"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Poprzedni kontakt na liście"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
-msgstr ""
+msgstr "Następna/poprzednia książka adresowa"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Akcje"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Odśwież listę kontaktów"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Dodaj nowy kontakt"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Dodaj nowa książkę adresową"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
-
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfiguruj książkę adresową"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nowa książka adresowa"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Wyświetla odnośnik CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Pobiera książkę adresową"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Edytuje książkę adresową"
+msgstr "Usuń obecny kontakt"
 
-#: 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 "Usuwa książkę adresową"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Upuść fotografię aby załadować"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Usuń aktualne zdjęcie"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Edytuj aktualne zdjęcie"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Wczytaj nowe zdjęcie"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Wybierz zdjęcie z ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Edytuj szczegóły nazwy"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Usuwa książkę adresową"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Nazwa"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Wpisz nazwę"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
-msgstr ""
+msgstr "Strona www"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.jakasstrona.pl"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Idż do strony www"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-rrrr"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddziel grupy przecinkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Edytuj grupy"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferowane"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Określ prawidłowy adres e-mail."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Wpisz adres email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Mail na adres"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Usuń adres mailowy"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Wpisz numer telefonu"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Usuń numer telefonu"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Edytuj szczegóły adresu"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Dodaj notatkę tutaj."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Dodaj pole"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Uwaga"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Pobiera kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Usuwa kontakt"
 
@@ -670,7 +661,7 @@ msgstr ""
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Ulica i numer"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -699,7 +690,7 @@ msgstr "Kod pocztowy"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Kod pocztowy"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -802,7 +793,7 @@ msgstr "Wyświetlana nazwa"
 msgid "Active"
 msgstr "Aktywna"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Zapisz"
 
@@ -810,7 +801,7 @@ msgstr "Zapisz"
 msgid "Submit"
 msgstr "Potwierdź"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -834,29 +825,29 @@ msgstr "Nazwa nowej książki adresowej"
 msgid "Importing contacts"
 msgstr "importuj kontakty"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nie masz żadnych kontaktów w swojej książce adresowej."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Dodaj kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfiguruj książkę adresową"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Wybierz książki adresowe"
 
 #: templates/part.selectaddressbook.php:20
 msgid "Enter name"
-msgstr ""
+msgstr "Wpisz nazwę"
 
 #: templates/part.selectaddressbook.php:22
 msgid "Enter description"
-msgstr ""
+msgstr "Wprowadź opis"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -874,6 +865,34 @@ msgstr "Pierwszy adres"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Pobiera książkę adresową"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Edytuje książkę adresową"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nowa książka adresowa"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 5049bce7f64266ed7f996d7474a894e59c01a77e..ea413953c7f636c9a19fcb1783155e7e0ee828f3 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,10 +43,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Styczeń"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index b2dc4fe1f65cbdccacbed116ca51f021a51d9a3f..5d51eda986ee0dfee1a86b2c7e5591fdde29ac68 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 14:04+0000\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -66,7 +66,7 @@ msgstr "Polski"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Ostrzeżenia bezpieczeństwa"
 
 #: templates/admin.php:28
 msgid "Log"
@@ -208,18 +208,14 @@ msgstr "Domyślny udział"
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
-msgstr ""
+msgstr "SubAdmin"
 
 #: templates/users.php:82
 msgid "Quota"
 msgstr "Udział"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Usuń"
diff --git a/l10n/pt_BR/contacts.po b/l10n/pt_BR/contacts.po
index 9f9833ac2d7b02b524b71abce0889949c2c17d2f..cce81b3b226c4dac3e53b0bf7eaed1be45f66353 100644
--- a/l10n/pt_BR/contacts.po
+++ b/l10n/pt_BR/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Erro ao (des)ativar agenda."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Ocorreu um erro ao adicionar o contato."
@@ -32,7 +28,9 @@ msgstr "Ocorreu um erro ao adicionar o contato."
 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
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID não definido."
 
@@ -56,6 +54,18 @@ msgstr "Tentando adiciona propriedade duplicada:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Erro ao (des)ativar agenda."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Não é possível atualizar sua agenda com um nome em branco."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erro ao atualizar agenda."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID fornecido"
@@ -169,14 +179,6 @@ msgstr "Something went FUBAR. "
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedades do contato."
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Erro ao atualizar agenda."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro enviando contatos para armazenamento."
@@ -223,71 +225,78 @@ msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 msgid "Contacts"
 msgstr "Contatos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Desculpe, esta funcionalidade não foi implementada ainda"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "não implementado"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contato"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Não foi possível serializar elementos."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" chamado sem argumento de tipo. Por favor, informe a bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nenhum arquivo selecionado para carregar."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O arquivo que você está tentando carregar excede o tamanho máximo para este servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Selecione o tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado:"
@@ -300,129 +309,133 @@ msgstr "importado,"
 msgid " failed."
 msgstr "falhou."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Lista de endereços não encontrado."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua agenda de endereços."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contato não pôde ser encontrado."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Endereço"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Trabalho"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Home"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Móvel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Agendas de Endereço"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fechar."
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar Livro de Endereços"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nova agenda"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Link CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Baixar"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: 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 "Excluir"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Arraste a foto para ser carregada"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Deletar imagem atual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar imagem atual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Carregar nova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecionar foto do OwnCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Excluir"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Apelido"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Digite o apelido"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe grupos por virgula"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor, especifique um email válido."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Digite um endereço de email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Correio para endereço"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Remover endereço de email"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Digite um número de telefone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Remover número de telefone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visualizar no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar detalhes de endereço"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Adicionar notas"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Baixar contato"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Apagar contato"
 
@@ -801,7 +792,7 @@ msgstr "Nome de exibição"
 msgid "Active"
 msgstr "Ativo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salvar"
 
@@ -809,7 +800,7 @@ msgstr "Salvar"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -833,15 +824,15 @@ msgstr "Nome da nova agenda de endereços"
 msgid "Importing contacts"
 msgstr "Importar contatos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Voce não tem contatos em sua agenda de endereços."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Adicionar contatos"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar agenda de endereços"
 
@@ -873,6 +864,34 @@ msgstr "Endereço primário(Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Baixar"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nova agenda"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 2e90ce266ff698467726fcd8582003e6aa561b83..bdf2c828c385124b61f26b1433965e9dc4f95d04 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Janeiro"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 7f26bc7340eb699af01129573d19a5a2ced20732..d190c95cebd08802c9b4b3248e318db1422523e7 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -206,7 +206,7 @@ msgstr "Quota Padrão"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -214,10 +214,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/pt_PT/contacts.po b/l10n/pt_PT/contacts.po
index c76d7bf6d2d0158c3cf780805d1e2bcd43e25461..079871ab19d5f5f439e3c5fdc7e9d4f7f94a33d8 100644
--- a/l10n/pt_PT/contacts.po
+++ b/l10n/pt_PT/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: 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:47
 msgid "There was an error adding the contact."
 msgstr "Erro ao adicionar contato"
@@ -32,7 +28,9 @@ msgstr "Erro ao adicionar contato"
 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
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id não está definido"
 
@@ -56,6 +54,18 @@ msgstr "A tentar adicionar propriedade duplicada: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Erro a (des)ativar o livro de endereços"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Não é possivel actualizar o livro de endereços com o nome vazio."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Erro a atualizar o livro de endereços"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nenhum ID inserido"
@@ -169,14 +179,6 @@ msgstr "Algo provocou um FUBAR. "
 msgid "Error updating contact property."
 msgstr "Erro ao atualizar propriedade do contato"
 
-#: 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:25
-msgid "Error updating addressbook."
-msgstr "Erro a atualizar o livro de endereços"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Erro a carregar os contactos para o armazenamento."
@@ -223,71 +225,78 @@ msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Desculpe, esta funcionalidade ainda não está implementada"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Não implementado"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Erro"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contacto"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Esta propriedade não pode estar vazia."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Não foi possivel serializar os elementos"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' chamada sem argumento definido. Por favor report o problema em bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nenhum ficheiro seleccionado para enviar."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Seleccionar tipo"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultado: "
@@ -300,129 +309,133 @@ msgstr " importado, "
 msgid " failed."
 msgstr " falhou."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Livro de endereços não encontrado."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Esta não é a sua lista de contactos"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "O contacto não foi encontrado"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Morada"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefone"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organização"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Emprego"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Casa"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Telemovel"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Texto"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voz"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Vídeo"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Aniversário"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Importar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Livros de endereços"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Fechar"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Configurar livros de endereços"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Novo livro de endereços"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Endereço CardDav"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Transferir"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editar"
-
-#: 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 "Apagar"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Arraste e solte fotos para carregar"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Eliminar a foto actual"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Editar a foto actual"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Carregar nova foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Selecionar uma foto da ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formate personalizado, Nome curto, Nome completo, Reverso ou Reverso com virgula"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Editar detalhes do nome"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Apagar"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introduza alcunha"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separe os grupos usando virgulas"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editar grupos"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Por favor indique um endereço de correio válido"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introduza endereço de email"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Enviar correio para o endereço"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Eliminar o endereço de correio"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Insira o número de telefone"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Eliminar o número de telefone"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Editar os detalhes do endereço"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Insira notas aqui."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefone"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Nota"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Transferir contacto"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Apagar contato"
 
@@ -801,7 +792,7 @@ msgstr "Nome de exibição"
 msgid "Active"
 msgstr "Ativo"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Guardar"
 
@@ -809,7 +800,7 @@ msgstr "Guardar"
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -833,15 +824,15 @@ msgstr "Nome do novo livro de endereços"
 msgid "Importing contacts"
 msgstr "A importar os contactos"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Não tem contactos no seu livro de endereços."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Adicionar contacto"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Configurar livros de endereços"
 
@@ -873,6 +864,34 @@ msgstr "Endereço primario (Kontact et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Transferir"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Novo livro de endereços"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 31d1426a4754f1e54c0df7ee35b9697ad71a3df3..18fae557ab63adbfce94fd7df93ff2090dd38d0b 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Janeiro"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 4a6eac5818a1022099d7b3a0d8b176017049ceda..fbd1ad70ba617e7865a190b73ae4e0422c8300d7 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Quota por defeito"
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Quota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/ro/contacts.po b/l10n/ro/contacts.po
index 0cff9f1cd589df8e91ad2aca4a714f65ff6afdc2..6b883047de8451a888ad2ed116919782f9031533 100644
--- a/l10n/ro/contacts.po
+++ b/l10n/ro/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "(Dez)activarea agendei a întâmpinat o eroare."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "O eroare a împiedicat adăugarea contactului."
@@ -32,7 +28,9 @@ msgstr "O eroare a împiedicat adăugarea contactului."
 msgid "element name is not set."
 msgstr "numele elementului nu este stabilit."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID-ul nu este stabilit"
 
@@ -56,6 +54,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(Dez)activarea agendei a întâmpinat o eroare."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Eroare la actualizarea agendei."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Nici un ID nu a fost furnizat"
@@ -169,14 +179,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Eroare la actualizarea proprietăților contactului."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr ""
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Eroare la actualizarea agendei."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr ""
@@ -223,71 +225,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Contacte"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -300,129 +309,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Nu se găsește în agendă."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Contactul nu a putut fi găsit."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresă"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizație"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Servicu"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Acasă"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Voce"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Mesaj"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Zi de naștere"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Agende"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Agendă nouă"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "Legătură CardDev"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Descarcă"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Editează"
-
-#: 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 "Șterge"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Introdu detalii despre nume"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Șterge"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Introdu pseudonim"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "zz-ll-aaaa"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separă grupurile cu virgule"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editează grupuri"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Preferat"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Te rog să specifici un e-mail corect"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Introdu adresa de e-mail"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Trimite mesaj la e-mail"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Șterge e-mail"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Descarcă acest contact"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Șterge contact"
 
@@ -801,7 +792,7 @@ msgstr "Nume afișat"
 msgid "Active"
 msgstr "Activ"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Salvează"
 
@@ -809,7 +800,7 @@ msgstr "Salvează"
 msgid "Submit"
 msgstr "Trimite"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -833,15 +824,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -873,6 +864,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Descarcă"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Editează"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Agendă nouă"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index c718775f6e2fa7821ce7295a6cba2441fa95120e..5a733b5eb1ab240bdb152765166ac1e1d40efd90 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index f106c9706f963ba59d8b9ead178595afd716ab13..64845e98ca57bbc4ca26d2bb72cf0505120e6ecc 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -205,7 +205,7 @@ msgstr "Cotă implicită"
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -213,10 +213,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Cotă"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Șterge"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index a7988b19f42479feeaa93853f926612e26ef84bb..d084087a97ecbb1aff58bcb2bf34fe924d558245 100644
--- a/l10n/ru/contacts.po
+++ b/l10n/ru/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -24,10 +24,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Ошибка (де)активации адресной книги."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Произошла ошибка при добавлении контакта."
@@ -36,7 +32,9 @@ msgstr "Произошла ошибка при добавлении контак
 msgid "element name is not set."
 msgstr "имя элемента не установлено."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id не установлен."
 
@@ -60,6 +58,18 @@ msgstr "При попытке добавить дубликат:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Ошибка (де)активации адресной книги."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Нельзя обновить адресную книгу с пустым именем."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Ошибка обновления адресной книги."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID не предоставлен"
@@ -173,14 +183,6 @@ msgstr "Что-то пошло FUBAR."
 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 "Ошибка загрузки контактов в хранилище."
@@ -227,71 +229,78 @@ msgstr "Файл не был загружен. Неизвестная ошибк
 msgid "Contacts"
 msgstr "Контакты"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "К сожалению, эта функция не была реализована"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Не реализовано"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Это свойство должно быть не пустым."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Не удалось сериализовать элементы."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' called without type argument. Please report at bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Изменить имя"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Нет выбранных файлов для загрузки."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Выберите тип"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Результат:"
@@ -304,129 +313,133 @@ msgstr "импортировано, "
 msgid " failed."
 msgstr "не удалось."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Адресная книга не найдена."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Это не ваша адресная книга."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Контакт не найден."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адрес"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Ящик эл. почты"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Организация"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Рабочий"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Домашний"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Сообщение"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Интернет"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "День рождения"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -446,207 +459,185 @@ msgstr "Импорт"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Адресные книги"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Закрыть"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Ссылка CardDAV"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Перетяните фотографии для загрузки"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Удалить текущую фотографию"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Редактировать текущую фотографию"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Загрузить новую фотографию"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Выбрать фотографию из ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Формат Краткое имя, Полное имя"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Изменить детали имени"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Введите псевдоним"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Разделить группы запятыми"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Редактировать группы"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Предпочитаемый"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Укажите действительный адрес электронной почты."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Укажите адрес электронной почты"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Написать по адресу"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Удалить адрес электронной почты"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Ввести номер телефона"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Удалить номер телефона"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Показать на карте"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Ввести детали адреса"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Добавьте заметки здесь."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Добавить поле"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Заметка"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Скачать контакт"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Удалить контакт"
 
@@ -805,7 +796,7 @@ msgstr "Отображаемое имя"
 msgid "Active"
 msgstr "Активно"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Сохранить"
 
@@ -813,7 +804,7 @@ msgstr "Сохранить"
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -837,15 +828,15 @@ msgstr "Имя новой адресной книги"
 msgid "Importing contacts"
 msgstr "Импорт контактов"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "В адресной книге нет контактов."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Добавить контакт"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Настроить адресную книгу"
 
@@ -877,6 +868,34 @@ msgstr "Первичный адрес (Kontact и др.)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Скачать"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Редактировать"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Новая адресная книга"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 997362d18fa1e83435beb964d32d33bdbcace667..eb287d698810f559b35f81876fc9f9c9f2ec55b0 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Январь"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e0e1293d2e1390c96d605a7511f50bcb7230b24f..9b23f80a3e1f5ffcfcf11ee8b23dc6afc525b0f9 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 09:15+0000\n"
-"Last-Translator: Nick Remeslennikov <homolibere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -208,7 +208,7 @@ msgstr "Квота по умолчанию"
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -216,10 +216,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Квота"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Удалить"
diff --git a/l10n/sk_SK/contacts.po b/l10n/sk_SK/contacts.po
index d4ab54e819c96de37c5351fda0105e4ba102f5d0..bd509c1c34daabcd76eee73a68d423e8304bbfc0 100644
--- a/l10n/sk_SK/contacts.po
+++ b/l10n/sk_SK/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Chyba (de)aktivácie adresára."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
@@ -32,7 +28,9 @@ msgstr "Vyskytla sa chyba pri pridávaní kontaktu."
 msgid "element name is not set."
 msgstr "meno elementu nie je nastavené."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID nie je nastavené."
 
@@ -56,6 +54,18 @@ msgstr "Pokúšate sa pridať rovnaký atribút:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Chyba (de)aktivácie adresára."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Nedá sa upraviť adresár s prázdnym menom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Chyba aktualizácie adresára."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID nezadané"
@@ -169,14 +179,6 @@ msgstr "Niečo sa pokazilo."
 msgid "Error updating contact property."
 msgstr "Chyba aktualizovania údaju kontaktu."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Nedá sa upraviť adresár s prázdnym menom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Chyba aktualizácie adresára."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Chyba pri ukladaní kontaktov na úložisko."
@@ -223,71 +225,78 @@ msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Bohužiaľ, táto funkcia ešte nebola implementovaná"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Neimplementované"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Nemôžem získať platnú 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Chyba"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Nový"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Tento parameter nemôže byť prázdny."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Nemôžem previesť prvky."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 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:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Upraviť meno"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Žiadne súbory neboli vybrané k nahratiu"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Vybrať typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Výsledok: "
@@ -300,129 +309,133 @@ msgstr " importovaných, "
 msgid " failed."
 msgstr " zlyhaných."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adresár sa nenašiel."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Toto nie je váš adresár."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt nebol nájdený."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefón"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizácia"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Práca"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Domov"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "SMS"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Odkazová schránka"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Správa"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pager"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Narodeniny"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Biznis"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Klienti"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Prázdniny"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Iné"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projekty"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Otázky"
 
@@ -442,207 +455,185 @@ msgstr "Importovať"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adresáre"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Klávesové skratky"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Navigácia"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Ďalší kontakt v zozname"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Predchádzajúci kontakt v zozname"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Ďalší/predošlí adresár"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Obnov zoznam kontaktov"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Pridaj nový kontakt"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Pridaj nový adresár"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Vymaž súčasný kontakt"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastaviť adresáre"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nový adresár"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav odkaz"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Stiahnuť"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Upraviť"
-
-#: 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 "Odstrániť"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Pretiahnite sem fotku pre nahratie"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Odstrániť súčasnú fotku"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Upraviť súčasnú fotku"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Nahrať novú fotku"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Vybrať fotku z ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "Formát vlastný, krátke meno, celé meno, obrátené alebo obrátené s čiarkami"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Upraviť podrobnosti mena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Zadajte prezývku"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Oddelte skupiny čiarkami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Úprava skupín"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Uprednostňované"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Prosím zadajte platnú e-mailovú adresu."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Zadajte e-mailové adresy"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Odoslať na adresu"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Odstrániť e-mailové adresy"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Zadajte telefónne číslo"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Odstrániť telefónne číslo"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Upraviť podrobnosti adresy"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Tu môžete pridať poznámky."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Pridať pole"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefón"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Poznámka"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Stiahnuť kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Odstrániť kontakt"
 
@@ -801,7 +792,7 @@ msgstr "Zobrazené meno"
 msgid "Active"
 msgstr "Aktívny"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Uložiť"
 
@@ -809,7 +800,7 @@ msgstr "Uložiť"
 msgid "Submit"
 msgstr "Odoslať"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -833,15 +824,15 @@ msgstr "Meno nového adresára"
 msgid "Importing contacts"
 msgstr "Importovanie kontaktov"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Nemáte žiadne kontakty v adresári."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Pridať kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Nastaviť adresáre"
 
@@ -873,6 +864,34 @@ msgstr "Predvolená adresa (Kontakt etc)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Upraviť"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nový adresár"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index cd00f6ca1f7d9e7421fc50d6b0f1bb9180bd4e80..42eb519975785765ff87681da6490edb7ff67083 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Január"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 38d8e42187e1cf33cb25e6b92391d5467cbe1812..086d0c86835a89d3a8442a1fff48dc70e84b6329 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "Predvolená kvóta"
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Kvóta"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Odstrániť"
diff --git a/l10n/sl/contacts.po b/l10n/sl/contacts.po
index 6da58b6275f5f5b62c4fdc97817567a6b704e359..60528db291a85ecfdde4d629b06f09b5161cd190 100644
--- a/l10n/sl/contacts.po
+++ b/l10n/sl/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Napaka med (de)aktivacijo imenika."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Med dodajanjem stika je prišlo do napake"
@@ -32,7 +28,9 @@ msgstr "Med dodajanjem stika je prišlo do napake"
 msgid "element name is not set."
 msgstr "ime elementa ni nastavljeno."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id ni nastavljen."
 
@@ -56,6 +54,18 @@ msgstr "Poskušam dodati podvojeno lastnost:"
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Napaka med (de)aktivacijo imenika."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Ne morem posodobiti imenika s praznim imenom."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Napaka pri posodabljanju imenika."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID ni bil podan"
@@ -169,14 +179,6 @@ msgstr "Nekaj je šlo v franže. "
 msgid "Error updating contact property."
 msgstr "Napaka pri posodabljanju lastnosti stika."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Ne morem posodobiti imenika s praznim imenom."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Napaka pri posodabljanju imenika."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Napaka pri nalaganju stikov v hrambo."
@@ -223,71 +225,78 @@ msgstr "Nobena datoteka ni bila naložena. Neznana napaka"
 msgid "Contacts"
 msgstr "Stiki"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Žal ta funkcionalnost še ni podprta"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Ni podprto"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Napaka"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Stik"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Ta lastnost ne sme biti prazna"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Predmetov ni bilo mogoče dati v zaporedje."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "\"deleteProperty\" je bila klicana brez vrste argumenta. Prosimo, če oddate  poročilo o napaki na bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Uredi ime"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Nobena datoteka ni bila izbrana za nalaganje."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteka, ki jo poskušate naložiti, presega največjo dovoljeno velikost za nalaganje na tem strežniku."
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Izberite vrsto"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Rezultati: "
@@ -300,129 +309,133 @@ msgstr " uvoženih, "
 msgid " failed."
 msgstr " je spodletelo."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Imenik ni bil najden."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "To ni vaš imenik."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Stika ni bilo mogoče najti."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Naslov"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-pošta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Delo"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Doma"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Besedilo"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Sporočilo"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "Uvozi"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Imeniki"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Zapri"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Nastavi imenike"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Nov imenik"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav povezava"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Prenesi"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Uredi"
-
-#: 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 "Izbriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Spustite sliko tukaj, da bi jo naložili"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Izbriši trenutno sliko"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Uredi trenutno sliko"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Naloži novo sliko"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Izberi sliko iz ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Uredite podrobnosti imena"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Izbriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Vnesite vzdevek"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd. mm. yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Skupine ločite z vejicami"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Uredi skupine"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Prednosten"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Prosimo, če navedete veljaven e-poštni naslov."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Vnesite e-poštni naslov"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "E-pošta naslovnika"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Izbriši e-poštni naslov"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Vpiši telefonsko številko"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Izbriši telefonsko številko"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Uredi podrobnosti"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Opombe dodajte tukaj."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Dodaj polje"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Opomba"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Prenesi stik"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Izbriši stik"
 
@@ -801,7 +792,7 @@ msgstr "Ime za prikaz"
 msgid "Active"
 msgstr "Aktiven"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Shrani"
 
@@ -809,7 +800,7 @@ msgstr "Shrani"
 msgid "Submit"
 msgstr "Potrdi"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -833,15 +824,15 @@ msgstr "Ime novega imenika"
 msgid "Importing contacts"
 msgstr "Uvažam stike"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "V vašem imeniku ni stikov."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Dodaj stik"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Nastavi imenike"
 
@@ -873,6 +864,34 @@ msgstr "Primarni naslov (za kontakt et al)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Prenesi"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Nov imenik"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 4fc16e05df29f170328e2583aacf3c3e174f1543..c3f2d15c367e3faf59de372febbec06c1465fe9b 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -40,10 +40,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "januar"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 25758a953797a71c99585cbf3e5e4346cd38f4d8..0b8d353a0c9631f5dc07dd7fe57bf7746277a256 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 02:03+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "Privzeta količinska omejitev"
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "PodSkrbnik"
 
@@ -212,10 +212,6 @@ msgstr "PodSkrbnik"
 msgid "Quota"
 msgstr "Količinska omejitev"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "PodSkrbnik za ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Izbriši"
diff --git a/l10n/so/contacts.po b/l10n/so/contacts.po
index c96ce8db6969c7fcf1706ecb35bb126b7fcddddc..63337ab5cf19780d20af05e6891648adb055436e 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Language: so\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 03d2be49971e5d7938dd29908b63add44e979052..81021ac3e6de6f35ec63c4eb4bdd5a5a9dfba8eb 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 4a50494e555d95dcf983d4606148ae5463aa7b48..1d7081baad7f8b181ac7608c383fcb7e83fd6c1d 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/sr/contacts.po b/l10n/sr/contacts.po
index d526bdd6da823c5ace01bfc55a21000aa29b1be7..2b4ced16c7af0d68ed6b23ab4343f794515a04dd 100644
--- a/l10n/sr/contacts.po
+++ b/l10n/sr/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 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 ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Контакти"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Контакт"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ово није ваш адресар."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Контакт се не може наћи."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Е-маил"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Организација"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Посао"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Кућа"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Глас"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Видео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пејџер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Адресар"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Обриши"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Пожељан"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Преузми контакт"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Обриши контакт"
 
@@ -799,7 +790,7 @@ msgstr "Приказано име"
 msgid "Active"
 msgstr "Активан"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Сними"
 
@@ -807,7 +798,7 @@ msgstr "Сними"
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Преузимање"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Уреди"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нови адресар"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index f2a2095d88885b7503a6d4c7d933ca83269ad976..58a7f8706ace1287df277c23c61d6491e0337147 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index f9bdbc97536ce0c095b53225232bf533a250ffb0..3976e060afb5f87321042f15e6b4bee6e2b31b2f 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Обриши"
diff --git a/l10n/sr@latin/contacts.po b/l10n/sr@latin/contacts.po
index f767552e5c8f0330ae0573263be143cf986bb399..116e2d372d63b38086aab281546f4b773451d0d6 100644
--- a/l10n/sr@latin/contacts.po
+++ b/l10n/sr@latin/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 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 ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Ovo nije vaš adresar."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt se ne može naći."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adresa"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizacija"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Posao"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Kuća"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Tekst"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Glas"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "Uredi"
-
-#: 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 "Obriši"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Obriši"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -799,7 +790,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -807,7 +798,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Uredi"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index fd21f716a1b72ffb885a897584b5f4a570954992..4577fbf12de5d971dd54c2257cff2b97ebc4b5ff 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 076b4a92d798d83b39d9cfb1f40b266d67976d0f..a4a177f7dbed10e6670c6791286329fa190b6ba5 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Obriši"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index a786f05bf90ce26ede81214116d07a37ade0feaa..6269e183cfde4766efe0488d08e7181526b1aa7f 100644
--- a/l10n/sv/contacts.po
+++ b/l10n/sv/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Fel när (av)aktivera adressbok"
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Det uppstod ett fel när kontakt skulle läggas till"
@@ -34,7 +30,9 @@ msgstr "Det uppstod ett fel när kontakt skulle läggas till"
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ID är inte satt."
 
@@ -58,6 +56,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr "Kunde inte lägga till egenskap för kontakt:"
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Fel när (av)aktivera adressbok"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Kan inte uppdatera adressboken med ett tomt namn."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Fel uppstod när adressbok skulle uppdateras"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Inget ID angett"
@@ -171,14 +181,6 @@ msgstr ""
 msgid "Error updating contact property."
 msgstr "Fel uppstod när kontaktegenskap skulle uppdateras"
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Kan inte uppdatera adressboken med ett tomt namn."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Fel uppstod när adressbok skulle uppdateras"
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Fel uppstod när kontakt skulle lagras."
@@ -225,71 +227,78 @@ msgstr "Ingen fil uppladdad. Okänt fel"
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Tyvärr är denna funktion inte införd än"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Inte införd"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 msgstr "Kunde inte hitta en giltig adress."
 
-#: 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Fel"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kontakt"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Ny"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Denna egenskap får inte vara tom."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Kunde inte serialisera element."
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 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:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "Ändra namn"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Inga filer valda för uppladdning"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Välj typ"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Resultat:"
@@ -302,129 +311,133 @@ msgstr "importerad,"
 msgid " failed."
 msgstr "misslyckades."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Hittade inte adressboken"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Det här är inte din adressbok."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kontakt kunde inte hittas."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adress"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "E-post"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organisation"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Arbete"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Hem"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Text"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Röst"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Personsökare"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "Företag"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Ring"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Kunder"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Leverera"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Helgdagar"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Idéer"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -444,207 +457,185 @@ msgstr "Importera"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adressböcker"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Stäng"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr ""
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Konfigurera adressböcker"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Ny adressbok"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDAV länk"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Nedladdning"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Redigera"
-
-#: 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 "Radera"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Släpp foto för att ladda upp"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Ta bort aktuellt foto"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Redigera aktuellt foto"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Ladda upp ett nytt foto"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "Välj foto från ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr " anpassad, korta namn, hela namn, bakåt eller bakåt med komma"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "Redigera detaljer för namn"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Radera"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Ange smeknamn"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-åååå"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Separera grupperna med kommatecken"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Editera grupper"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Föredragen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Vänligen ange en giltig e-postadress"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Ange e-postadress"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Posta till adress."
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Ta bort e-postadress"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Ange ett telefonnummer"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Ta bort telefonnummer"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Visa på karta"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Redigera detaljer för adress"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Lägg till noteringar här."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Lägg till fält"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Notering"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Ladda ner kontakt"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Radera kontakt"
 
@@ -803,7 +794,7 @@ msgstr "Visningsnamn"
 msgid "Active"
 msgstr "Aktiv"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Spara"
 
@@ -811,7 +802,7 @@ msgstr "Spara"
 msgid "Submit"
 msgstr "Skicka in"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -835,15 +826,15 @@ msgstr "Namn för ny adressbok"
 msgid "Importing contacts"
 msgstr "Importerar kontakter"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Du har inga kontakter i din adressbok."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Lägg till en kontakt"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Konfigurera adressböcker"
 
@@ -875,6 +866,34 @@ msgstr "Primär adress (Kontakt o.a.)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Nedladdning"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Redigera"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Ny adressbok"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index e836e06af441039f12ed72fcc7b2e9fbfc6a8dbd..3017915cbb82d1a8a806471882b4ba163c166772 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 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"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index a1a94b378f00a99bcadfaae6b600139fdc9f745f..d9120851042fec5fa01f36cdba01726dff209095 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:03+0200\n"
-"PO-Revision-Date: 2012-07-29 20:26+0000\n"
-"Last-Translator: maghog <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -207,7 +207,7 @@ msgstr "Förvald datakvot"
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "Underadministratör"
 
@@ -215,10 +215,6 @@ msgstr "Underadministratör"
 msgid "Quota"
 msgstr "Kvot"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Underadministratör för ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Ta bort"
diff --git a/l10n/templates/bookmarks.pot b/l10n/templates/bookmarks.pot
index 7670957eb30e67eee06c7084f0e451833377925f..e89c3013f23a45f894400e0f6c20561c0851af76 100644
--- a/l10n/templates/bookmarks.pot
+++ b/l10n/templates/bookmarks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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 268728145d546539fd7a76f306764296ab58901c..7f5c94e340febe71fabb56a5543cca72fbc8ac90 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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 a1b58e5606485e2fe946a329885abd18d7b33dda..eb813eae169991c9d455b505121ba8bf3ba87b4d 100644
--- a/l10n/templates/contacts.pot
+++ b/l10n/templates/contacts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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"
@@ -17,10 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\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 ""
@@ -29,7 +25,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -53,6 +51,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -166,14 +176,6 @@ msgstr ""
 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 ""
@@ -220,71 +222,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at bugs."
 "owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -297,129 +306,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr ""
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr ""
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr ""
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr ""
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr ""
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr ""
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr ""
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr ""
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr ""
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -439,207 +452,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr ""
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr ""
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr ""
 
@@ -798,7 +789,7 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -806,7 +797,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -830,15 +821,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -870,6 +861,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr ""
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f0db3549bf3d564177d9f020a1bee0fd53b3f6b5..d07f4a40df556c2c4b2450ffde234d5a4a9eafe4 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,10 +37,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 315360d0d242b0409ee2267dfca5c00b44f7168c..aba904c9b0f59fb0e9eb039aec8aed9517426ada 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
index 8af0f4a2da6ed7887396c7ac159ecf50b81dae5a..a46ccf931af7b864fad6aac535788ae89ebe6a12 100644
--- a/l10n/templates/gallery.pot
+++ b/l10n/templates/gallery.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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 f4b8daced529cd498ec5635d3fd2cdb5b86296e2..7d7368041867f0791783bb6eb8e843d39076f1fd 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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 898394231956ea06d2d5e22dbf0cb0be146924a8..896a797b89fd99e201e40f01cccba8dcd664b389 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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 d6ae07cf20c946c42cc0becdf6e015f04f6076df..f72352b36de6471df7704b7582267f67685c2009 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 02:01+0200\n"
+"POT-Creation-Date: 2012-08-02 02:02+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"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -209,10 +209,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr ""
diff --git a/l10n/th_TH/contacts.po b/l10n/th_TH/contacts.po
index fbaf36dfc91e04435c347b0e3b77dd9fa165b49b..eb2c997995793945a6b6b9daf8465e7884a9e599 100644
--- a/l10n/th_TH/contacts.po
+++ b/l10n/th_TH/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\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 "เกิดข้อผิดพลาดในการเพิ่มรายชื่อผู้ติดต่อใหม่"
@@ -31,7 +27,9 @@ msgstr "เกิดข้อผิดพลาดในการเพิ่ม
 msgid "element name is not set."
 msgstr "ยังไม่ได้กำหนดชื่อ"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "ยังไม่ได้กำหนดรหัส"
 
@@ -55,6 +53,18 @@ msgstr "พยายามที่จะเพิ่มทรัพยากร
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ยังไม่ได้ใส่รหัส"
@@ -168,14 +178,6 @@ msgstr "มีบางอย่างเกิดการ FUBAR. "
 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 "เกิดข้อผิดพลาดในการอัพโหลดข้อมูลการติดต่อไปยังพื้นที่จัดเก็บข้อมูล"
@@ -222,71 +224,78 @@ msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโ
 msgid "Contacts"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "ขออภัย, ฟังก์ชั่นการทำงานนี้ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "ยังไม่ได้ถูกดำเนินการ"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "ข้อมูลการติดต่อ"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "คุณสมบัตินี้ต้องไม่มีข้อมูลว่างอยู่"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "ไม่สามารถทำสัญลักษณ์องค์ประกอบต่างๆให้เป็นตัวเลขตามลำดับได้"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' ถูกเรียกใช้โดยไม่มีอาร์กิวเมนต์ กรุณาแจ้งได้ที่ bugs.owncloud.org"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "แก้ไขชื่อ"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "ยังไม่ได้เลือกไฟล์ำสำหรับอัพโหลด"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "เลือกชนิด"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "ผลลัพธ์: "
@@ -299,129 +308,133 @@ msgstr " นำเข้าข้อมูลแล้ว, "
 msgid " failed."
 msgstr " ล้มเหลว."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "ไม่พบสมุดบันทึกที่อยู่ที่ต้องการ"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "นี่ไม่ใช่สมุดบันทึกที่อยู่ของคุณ"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "ไม่พบข้อมูลการติดต่อ"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "อีเมล์"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "หน่วยงาน"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "ที่ทำงาน"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "บ้าน"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "มือถือ"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "ข้อความ"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "เสียงพูด"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "ข้อความ"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "โทรสาร"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "วีดีโอ"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "เพจเจอร์"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "อินเทอร์เน็ต"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "วันเกิด"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr "นำเข้า"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "สมุดบันทึกที่อยู่"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "ปิด"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "ลิงค์ CardDav"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "วางรูปภาพที่ต้องการอัพโหลด"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "ลบรูปภาพปัจจุบัน"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "แก้ไขรูปภาพปัจจุบัน"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "อัพโหลดรูปภาพใหม่"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "เลือกรูปภาพจาก ownCloud"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "แก้ไขรายละเอียดของชื่อ"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "ลบ"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "กรอกชื่อเล่น"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "แก้ไขกลุ่ม"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "พิเศษ"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "กรุณาระบุที่อยู่อีเมลที่ถูกต้อง"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "กรอกที่อยู่อีเมล"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "ส่งอีเมลไปที่"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "ลบที่อยู่อีเมล"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "กรอกหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "ลบหมายเลขโทรศัพท์"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "ดูบนแผนที่"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "แก้ไขรายละเอียดที่อยู่"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "เพิ่มหมายเหตุกำกับไว้ที่นี่"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "เพิ่มช่องรับข้อมูล"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "โทรศัพท์"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "หมายเหตุ"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "ดาวน์โหลดข้อมูลการติดต่อ"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "ลบข้อมูลการติดต่อ"
 
@@ -800,7 +791,7 @@ msgstr "ชื่อที่ต้องการให้แสดง"
 msgid "Active"
 msgstr "เปิดใช้"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "บันทึก"
 
@@ -808,7 +799,7 @@ msgstr "บันทึก"
 msgid "Submit"
 msgstr "ส่งข้อมูล"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -832,15 +823,15 @@ msgstr "กำหนดชื่อของสมุดที่อยู่ท
 msgid "Importing contacts"
 msgstr "นำเข้าข้อมูลการติดต่อ"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "คุณยังไม่มีข้อมูลการติดต่อใดๆในสมุดบันทึกที่อยู่ของคุณ"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "เพิ่มชื่อผู้ติดต่อ"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "กำหนดค่าสมุดบันทึกที่อยู่"
 
@@ -872,6 +863,34 @@ msgstr "ที่อยู่หลัก (สำหรับติดต่อ)
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "แก้ไข"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 229c958879359786827e92d635fe4c0e6c4851d6..4a078f83302f133637bf7c39a8c43fd47b0dc248 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "มกราคม"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 33c12981c451e658005f126bc93d0544c21a2a13..df4bad317ac60db2b502eaf7750a89374b4b80b0 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "โควต้าที่กำหนดไว้เริ่มต้
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "พื้นที่"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "ลบ"
diff --git a/l10n/tr/contacts.po b/l10n/tr/contacts.po
index 041e00bf18bee4d788c83bd3731e9dd8b7af1115..821e951cc515dc33b42969da4be8f2a2e465b143 100644
--- a/l10n/tr/contacts.po
+++ b/l10n/tr/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ajax/activation.php:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr "Adres defteri etkisizleştirilirken hata oluştu."
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr "Kişi eklenirken hata oluştu."
@@ -32,7 +28,9 @@ msgstr "Kişi eklenirken hata oluştu."
 msgid "element name is not set."
 msgstr "eleman ismi atanmamış."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id atanmamış."
 
@@ -56,6 +54,18 @@ msgstr "Yinelenen özellik eklenmeye çalışılıyor: "
 msgid "Error adding contact property: "
 msgstr "Kişi özelliği eklenirken hata oluştu."
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "Adres defteri etkisizleştirilirken hata oluştu."
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "Adres defteri güncellenirken hata oluştu."
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "ID verilmedi"
@@ -169,14 +179,6 @@ msgstr "Bir şey FUBAR gitti."
 msgid "Error updating contact property."
 msgstr "Kişi özelliği güncellenirken hata oluştu."
 
-#: ajax/updateaddressbook.php:21
-msgid "Cannot update addressbook with an empty name."
-msgstr "Adres defterini boş bir isimle güncelleyemezsiniz."
-
-#: ajax/updateaddressbook.php:25
-msgid "Error updating addressbook."
-msgstr "Adres defteri güncellenirken hata oluştu."
-
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
 msgstr "Bağlantıları depoya yükleme hatası"
@@ -223,71 +225,78 @@ msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Üzgünüz, bu özellik henüz tamamlanmadı."
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "Tamamlanmadı."
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 msgid "Couldn't get a valid address."
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "Hata"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Kişi"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr "Yeni"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr "Yeni Kişi"
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "Bu özellik boş bırakılmamalı."
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "Öğeler seri hale getiremedi"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' tip argümanı olmadan çağrıldı. Lütfen bugs.owncloud.org a rapor ediniz."
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "İsmi düzenle"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "Yükleme için dosya seçilmedi."
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosya sunucudaki dosya yükleme maksimum boyutunu aşmaktadır. "
 
-#: js/contacts.js:1338 js/contacts.js:1372
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "Tür seç"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "Sonuç: "
@@ -300,129 +309,133 @@ msgstr " içe aktarıldı, "
 msgid " failed."
 msgstr " hatalı."
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "Adres defteri bulunamadı."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Bu sizin adres defteriniz değil."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "Kişi bulunamadı."
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Adres"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Eposta"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "İş"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Ev"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Mobil"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Metin"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Ses"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "mesaj"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "İnternet"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Doğum günü"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr "İş"
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr "Çağrı"
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr "Müşteriler"
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr "Dağıtıcı"
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr "Tatiller"
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr "Fikirler"
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr "Seyahat"
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr "Yıl Dönümü"
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr "Diğer"
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr "Kişisel"
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr "Projeler"
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr "Sorular"
 
@@ -442,207 +455,185 @@ msgstr "İçe aktar"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Adres defterleri"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "Kapat"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr "Klavye kısayolları"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr "Dolaşım"
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr "Listedeki sonraki kişi"
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr "Listedeki önceki kişi"
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr "Şuanki adres defterini genişlet/daralt"
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr "Sonraki/Önceki adres defteri"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr "Eylemler"
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr "Kişi listesini tazele"
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr "Yeni kişi ekle"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr "Yeni adres defteri ekle"
 
-#: templates/index.php:64
+#: templates/index.php:63
 msgid "Delete current contact"
 msgstr "Şuanki kişiyi sil"
 
-#: templates/part.chooseaddressbook.php:1
-msgid "Configure Address Books"
-msgstr "Adres Defterlerini Yapılandır"
-
-#: templates/part.chooseaddressbook.php:16
-msgid "New Address Book"
-msgstr "Yeni Adres Defteri"
-
-#: templates/part.chooseaddressbook.php:21
-#: templates/part.chooseaddressbook.rowfields.php:8
-msgid "CardDav Link"
-msgstr "CardDav Bağlantısı"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "İndir"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Düzenle"
-
-#: 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 "Sil"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "Fotoğrafı yüklenmesi için bırakın"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "Mevcut fotoğrafı sil"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "Mevcut fotoğrafı düzenle"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "Yeni fotoğraf yükle"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "ownCloud'dan bir fotoğraf seç"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 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:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "İsim detaylarını düzenle"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Sil"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "Takma adı girin"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr "Web sitesi"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr "http://www.somesite.com"
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr "Web sitesine git"
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "gg-aa-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "Gruplar"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "Grupları birbirinden virgülle ayırın"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "Grupları düzenle"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "Tercih edilen"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "Lütfen geçerli bir eposta adresi belirtin."
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "Eposta adresini girin"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "Eposta adresi"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "Eposta adresini sil"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "Telefon numarasını gir"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "Telefon numarasını sil"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "Haritada gör"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "Adres detaylarını düzenle"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "Notları buraya ekleyin."
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "Alan ekle"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Telefon"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "Not"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "Kişiyi indir"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Kişiyi sil"
 
@@ -801,7 +792,7 @@ msgstr "Görünen adı"
 msgid "Active"
 msgstr "Aktif"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Kaydet"
 
@@ -809,7 +800,7 @@ msgstr "Kaydet"
 msgid "Submit"
 msgstr "Gönder"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "İptal"
 
@@ -833,15 +824,15 @@ msgstr "Yeni adres defteri için isim"
 msgid "Importing contacts"
 msgstr "Bağlantıları içe aktar"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "Adres defterinizde hiç bağlantı yok."
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "Bağlatı ekle"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "Adres defterini yapılandır"
 
@@ -873,6 +864,34 @@ msgstr "Birincil adres (Bağlantı ve arkadaşları)"
 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"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "İndir"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Düzenle"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Yeni Adres Defteri"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
+msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 4f27a0126c6f1178fc6a8e937aba3d3d37d1d276..06136c97ff9e8dc2f8f383a9ccad02899ed8d389 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "Ocak"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 66a8b77b9c7f420b1b194993a21d5189cada6ae6..2ac944dd68cdde6bd7b71146cbdb45c8bda45d66 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "Varsayılan Kota"
 msgid "Other"
 msgstr "Diğer"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr "Alt Yönetici"
 
@@ -212,10 +212,6 @@ msgstr "Alt Yönetici"
 msgid "Quota"
 msgstr "Kota"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr "Alt yönetici için ..."
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/uk/contacts.po b/l10n/uk/contacts.po
index 19ad51b59688928e94d1065a592d9cd17781fc01..7cdc0357d4ecd9f1d2cf2e9a9925b2d9cf5339f5 100644
--- a/l10n/uk/contacts.po
+++ b/l10n/uk/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "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:24 ajax/updateaddressbook.php:29
-msgid "Error (de)activating addressbook."
-msgstr ""
-
 #: ajax/addcontact.php:47
 msgid "There was an error adding the contact."
 msgstr ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr ""
@@ -167,14 +177,6 @@ msgstr ""
 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 ""
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "Це не ваша адресна книга."
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Адреса"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Телефон"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Організація"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr ""
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "Текст"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "Голос"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Факс"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Відео"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "Пейджер"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "День народження"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr ""
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Видалити"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Телефон"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Видалити контакт"
 
@@ -799,7 +790,7 @@ msgstr "Відображуване ім'я"
 msgid "Active"
 msgstr ""
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr ""
 
@@ -807,7 +798,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr ""
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Завантажити"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "Нова адресна книга"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index d0c31b79d53d01c8de17dd8d0b9587c7acd72f0f..731e7d912ef201befd2631460365bb676575c6af 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 134236723a8018e0fe14ed293c8997b58472f879..e2406d8e54b96b470033fd1d6de5ba9bf8da2f5d 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-30 21:39+0000\n"
-"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr ""
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Видалити"
diff --git a/l10n/vi/contacts.po b/l10n/vi/contacts.po
index 5451d950699c0937782131884d666aea22baa615..dab1d3502e8c8d637a8a9e41f344216894f06ba6 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,6 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
@@ -30,7 +26,9 @@ msgstr ""
 msgid "element name is not set."
 msgstr "tên phần tử không được thiết lập."
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "id không được thiết lập."
 
@@ -54,6 +52,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr ""
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr ""
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "Không có ID được cung cấp"
@@ -167,14 +177,6 @@ msgstr ""
 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 "Lỗi tải lên danh sách địa chỉ để lưu trữ."
@@ -221,71 +223,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "Danh sách"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -298,129 +307,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
+
+#: lib/app.php:36
+msgid "Addressbook not found: "
 msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr ""
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr ""
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "Điện thoại bàn"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "Email"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "Công việc"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "Nhà"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "Di động"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr ""
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr ""
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr ""
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "Video"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "số trang"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr ""
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "Ngày sinh nhật"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -440,207 +453,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "Sổ địa chỉ"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "CardDav Link"
-
-#: templates/part.chooseaddressbook.rowfields.php:11
-msgid "Download"
-msgstr "Tải về"
-
-#: templates/part.chooseaddressbook.rowfields.php:14
-msgid "Edit"
-msgstr "Sửa"
-
-#: 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 "Xóa"
-
-#: templates/part.contact.php:16
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr ""
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "Xóa"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr ""
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr ""
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr ""
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr ""
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr ""
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr ""
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr ""
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr ""
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr ""
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr ""
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr ""
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr ""
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr ""
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr ""
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr ""
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "Xóa liên lạc"
 
@@ -799,7 +790,7 @@ msgstr "Hiển thị tên"
 msgid "Active"
 msgstr "Kích hoạt"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "Lưu"
 
@@ -807,7 +798,7 @@ msgstr "Lưu"
 msgid "Submit"
 msgstr "Submit"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "Hủy"
 
@@ -831,15 +822,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -871,6 +862,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "Sửa"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 60bed8f0dcf81b245996ddd94c95e731462fdc07..29ceebc712b72d5813b54156e1ae4e7c0a94ddaa 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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 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"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index ab28333467152a7c8efa05f6c8994691a6b63265..55b0485ddf3239e3e36dd7617fb320f032ec0fec 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -203,7 +203,7 @@ msgstr "Hạn ngạch mặt định"
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -211,10 +211,6 @@ msgstr ""
 msgid "Quota"
 msgstr "Hạn ngạch"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "Xóa"
diff --git a/l10n/zh_CN/contacts.po b/l10n/zh_CN/contacts.po
index 577dc470d47642ddf694d3473f3e12a9bbe6d8b4..c66057c0cb907235343b6d014e56ac2b5252d717 100644
--- a/l10n/zh_CN/contacts.po
+++ b/l10n/zh_CN/contacts.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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,6 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\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 "添加联系人时出错。"
@@ -32,7 +28,9 @@ msgstr "添加联系人时出错。"
 msgid "element name is not set."
 msgstr "元素名称未设置"
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr "没有设置 id。"
 
@@ -56,6 +54,18 @@ msgstr "试图添加重复属性: "
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "(取消)激活地址簿错误。"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr "无法使用一个空名称更新地址簿"
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "更新地址簿错误"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
@@ -169,14 +179,6 @@ msgstr "有一些信息无法被处理。"
 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 "上传联系人到存储空间时出错"
@@ -223,71 +225,78 @@ msgstr "没有文件被上传。未知错误"
 msgid "Contacts"
 msgstr "联系人"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "抱歉,这个功能暂时还没有被实现"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr "未实现"
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr "错误"
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "联系人"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr "这个属性必须是非空的"
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr "无法序列化元素"
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' 调用时没有类型声明。请到 bugs.owncloud.org 汇报错误"
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr "编辑名称"
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr "没有选择文件以上传"
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr "选择类型"
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr "结果: "
@@ -300,129 +309,133 @@ msgstr " 已导入, "
 msgid " failed."
 msgstr " 失败。"
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "未找到地址簿。"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "这不是您的地址簿。"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "无法找到联系人。"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "电话"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "电子邮件"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "组织"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "工作"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "家庭"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "移动电话"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "文本"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "语音"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "消息"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "传真"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "视频"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "传呼机"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "互联网"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -442,207 +455,185 @@ msgstr "导入"
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "地址簿"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr "关闭"
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "CardDav 链接"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr "拖拽图片进行上传"
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr "删除当前照片"
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr "编辑当前照片"
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr "上传新照片"
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr "从 ownCloud 选择照片"
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr "自定义格式,简称,全名,姓在前,姓在前并用逗号分割"
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "编辑名称详情"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "删除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "昵称"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "输入昵称"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "yyyy-mm-dd"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "分组"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "用逗号隔开分组"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "编辑分组"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "偏好"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "请指定合法的电子邮件地址"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "输入电子邮件地址"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "发送邮件到地址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "删除电子邮件地址"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "输入电话号码"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "删除电话号码"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr "在地图上显示"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "编辑地址细节。"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "添加注释。"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "添加字段"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "电话"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "注释"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "下载联系人"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "删除联系人"
 
@@ -801,7 +792,7 @@ msgstr "显示名称"
 msgid "Active"
 msgstr "激活"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "保存"
 
@@ -809,7 +800,7 @@ msgstr "保存"
 msgid "Submit"
 msgstr "提交"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "取消"
 
@@ -833,15 +824,15 @@ msgstr "新地址簿名称"
 msgid "Importing contacts"
 msgstr "导入联系人"
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr "您的地址簿中没有联系人。"
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr "添加联系人"
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr "配置地址簿"
 
@@ -873,6 +864,34 @@ msgstr "首选地址 (Kontact 等)"
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "下载"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "编辑"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新建地址簿"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index f9babe102eb96ed97858ac0a6e668b4cb240cd0a..bc2b2800877b280c4f23fa23f756d57eb7d12adb 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -39,10 +39,6 @@ msgstr ""
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr "一月"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 8af9222105597bbe78ecc6ed59466a8ea154d838..cb16e2cbf863c83882a91b72c851b1e1689a9e01 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -204,7 +204,7 @@ msgstr "默认配额"
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -212,10 +212,6 @@ msgstr ""
 msgid "Quota"
 msgstr "配额"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "删除"
diff --git a/l10n/zh_TW/contacts.po b/l10n/zh_TW/contacts.po
index db0b2a0c0fae04cefaec0e709f782da1d119dece..dac86b63c63224ea45fe54c2ff2a7a3917c49a39 100644
--- a/l10n/zh_TW/contacts.po
+++ b/l10n/zh_TW/contacts.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,6 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\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 "添加通訊錄發生錯誤"
@@ -31,7 +27,9 @@ msgstr "添加通訊錄發生錯誤"
 msgid "element name is not set."
 msgstr ""
 
-#: ajax/addproperty.php:42 ajax/deletecard.php:30 ajax/saveproperty.php:37
+#: ajax/addproperty.php:42 ajax/addressbook/delete.php:31
+#: ajax/addressbook/update.php:20 ajax/deletecard.php:30
+#: ajax/saveproperty.php:37
 msgid "id is not set."
 msgstr ""
 
@@ -55,6 +53,18 @@ msgstr ""
 msgid "Error adding contact property: "
 msgstr ""
 
+#: ajax/addressbook/activate.php:24 ajax/addressbook/update.php:32
+msgid "Error (de)activating addressbook."
+msgstr "在啟用或關閉電話簿時發生錯誤"
+
+#: ajax/addressbook/update.php:24
+msgid "Cannot update addressbook with an empty name."
+msgstr ""
+
+#: ajax/addressbook/update.php:28
+msgid "Error updating addressbook."
+msgstr "電話簿更新中發生錯誤"
+
 #: ajax/categories/categoriesfor.php:17
 msgid "No ID provided"
 msgstr "未提供 ID"
@@ -168,14 +178,6 @@ msgstr ""
 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 ""
@@ -222,71 +224,78 @@ msgstr ""
 msgid "Contacts"
 msgstr "通訊錄"
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr ""
 
-#: js/contacts.js:64
+#: js/contacts.js:72
 msgid "Not implemented"
 msgstr ""
 
-#: js/contacts.js:69
+#: js/contacts.js:77
 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
+#: js/contacts.js:77 js/contacts.js:366 js/contacts.js:382 js/contacts.js:395
+#: js/contacts.js:683 js/contacts.js:723 js/contacts.js:749 js/contacts.js:786
+#: js/contacts.js:858 js/contacts.js:864 js/contacts.js:876 js/contacts.js:910
+#: js/contacts.js:1173 js/contacts.js:1181 js/contacts.js:1190
+#: js/contacts.js:1225 js/contacts.js:1257 js/contacts.js:1269
+#: js/contacts.js:1292 js/contacts.js:1430 js/contacts.js:1461
+#: js/settings.js:25 js/settings.js:42 js/settings.js:67
 msgid "Error"
 msgstr ""
 
-#: js/contacts.js:400 lib/search.php:15
+#: js/contacts.js:408 lib/search.php:15
 msgid "Contact"
 msgstr "通訊錄"
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New"
 msgstr ""
 
-#: js/contacts.js:400
+#: js/contacts.js:408
 msgid "New Contact"
 msgstr ""
 
-#: js/contacts.js:715
+#: js/contacts.js:723
 msgid "This property has to be non-empty."
 msgstr ""
 
-#: js/contacts.js:741
+#: js/contacts.js:749
 msgid "Couldn't serialize elements."
 msgstr ""
 
-#: js/contacts.js:850 js/contacts.js:868
+#: js/contacts.js:858 js/contacts.js:876
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr ""
 
-#: js/contacts.js:884
+#: js/contacts.js:892
 msgid "Edit name"
 msgstr ""
 
-#: js/contacts.js:1165
+#: js/contacts.js:1173
 msgid "No files selected for upload."
 msgstr ""
 
-#: js/contacts.js:1173
+#: js/contacts.js:1181
 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
+#: js/contacts.js:1346 js/contacts.js:1380
 msgid "Select type"
 msgstr ""
 
+#: js/contacts.js:1399
+msgid ""
+"Some contacts are marked for deletion, but not deleted yet. Please wait for "
+"them to be deleted."
+msgstr ""
+
 #: js/loader.js:49
 msgid "Result: "
 msgstr ""
@@ -299,129 +308,133 @@ msgstr ""
 msgid " failed."
 msgstr ""
 
-#: lib/app.php:34
-msgid "Addressbook not found."
-msgstr "找不到通訊錄"
+#: js/settings.js:67
+msgid "Displayname cannot be empty."
+msgstr ""
 
-#: lib/app.php:46
+#: lib/app.php:36
+msgid "Addressbook not found: "
+msgstr ""
+
+#: lib/app.php:49
 msgid "This is not your addressbook."
 msgstr "這不是你的電話簿"
 
-#: lib/app.php:65
+#: lib/app.php:68
 msgid "Contact could not be found."
 msgstr "通訊錄未發現"
 
-#: lib/app.php:109 templates/part.contact.php:116
+#: lib/app.php:112 templates/part.contact.php:117
 msgid "Address"
 msgstr "地址"
 
-#: lib/app.php:110
+#: lib/app.php:113
 msgid "Telephone"
 msgstr "電話"
 
-#: lib/app.php:111 templates/part.contact.php:115
+#: lib/app.php:114 templates/part.contact.php:116
 msgid "Email"
 msgstr "電子郵件"
 
-#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
-#: templates/part.contact.php:111
+#: lib/app.php:115 templates/part.contact.php:39 templates/part.contact.php:40
+#: templates/part.contact.php:112
 msgid "Organization"
 msgstr "組織"
 
-#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
+#: lib/app.php:127 lib/app.php:134 lib/app.php:144 lib/app.php:197
 msgid "Work"
 msgstr "公司"
 
-#: lib/app.php:125 lib/app.php:129 lib/app.php:142
+#: lib/app.php:128 lib/app.php:132 lib/app.php:145
 msgid "Home"
 msgstr "住宅"
 
-#: lib/app.php:130
+#: lib/app.php:133
 msgid "Mobile"
 msgstr "行動電話"
 
-#: lib/app.php:132
+#: lib/app.php:135
 msgid "Text"
 msgstr "文字"
 
-#: lib/app.php:133
+#: lib/app.php:136
 msgid "Voice"
 msgstr "語音"
 
-#: lib/app.php:134
+#: lib/app.php:137
 msgid "Message"
 msgstr "訊息"
 
-#: lib/app.php:135
+#: lib/app.php:138
 msgid "Fax"
 msgstr "傳真"
 
-#: lib/app.php:136
+#: lib/app.php:139
 msgid "Video"
 msgstr "影片"
 
-#: lib/app.php:137
+#: lib/app.php:140
 msgid "Pager"
 msgstr "呼叫器"
 
-#: lib/app.php:143
+#: lib/app.php:146
 msgid "Internet"
 msgstr "網際網路"
 
-#: lib/app.php:180 templates/part.contact.php:44
-#: templates/part.contact.php:113
+#: lib/app.php:183 templates/part.contact.php:45
+#: templates/part.contact.php:114
 msgid "Birthday"
 msgstr "生日"
 
-#: lib/app.php:181
+#: lib/app.php:184
 msgid "Business"
 msgstr ""
 
-#: lib/app.php:182
+#: lib/app.php:185
 msgid "Call"
 msgstr ""
 
-#: lib/app.php:183
+#: lib/app.php:186
 msgid "Clients"
 msgstr ""
 
-#: lib/app.php:184
+#: lib/app.php:187
 msgid "Deliverer"
 msgstr ""
 
-#: lib/app.php:185
+#: lib/app.php:188
 msgid "Holidays"
 msgstr ""
 
-#: lib/app.php:186
+#: lib/app.php:189
 msgid "Ideas"
 msgstr ""
 
-#: lib/app.php:187
+#: lib/app.php:190
 msgid "Journey"
 msgstr ""
 
-#: lib/app.php:188
+#: lib/app.php:191
 msgid "Jubilee"
 msgstr ""
 
-#: lib/app.php:189
+#: lib/app.php:192
 msgid "Meeting"
 msgstr ""
 
-#: lib/app.php:190
+#: lib/app.php:193
 msgid "Other"
 msgstr ""
 
-#: lib/app.php:191
+#: lib/app.php:194
 msgid "Personal"
 msgstr ""
 
-#: lib/app.php:192
+#: lib/app.php:195
 msgid "Projects"
 msgstr ""
 
-#: lib/app.php:193
+#: lib/app.php:196
 msgid "Questions"
 msgstr ""
 
@@ -441,207 +454,185 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/index.php:18
+#: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
 msgstr "電話簿"
 
-#: templates/index.php:38 templates/part.import.php:24
+#: templates/index.php:37 templates/part.import.php:24
 msgid "Close"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:39
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Navigation"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:44
 msgid "Next contact in list"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:46
 msgid "Previous contact in list"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:48
 msgid "Expand/collapse current addressbook"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:50
 msgid "Next/previous addressbook"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "Actions"
 msgstr ""
 
-#: templates/index.php:58
+#: templates/index.php:57
 msgid "Refresh contacts list"
 msgstr ""
 
-#: templates/index.php:60
+#: templates/index.php:59
 msgid "Add new contact"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Add new addressbook"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:63
 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 "CardDav 聯結"
-
-#: 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
+#: templates/part.contact.php:17
 msgid "Drop photo to upload"
 msgstr ""
 
-#: templates/part.contact.php:18
+#: templates/part.contact.php:19
 msgid "Delete current photo"
 msgstr ""
 
-#: templates/part.contact.php:19
+#: templates/part.contact.php:20
 msgid "Edit current photo"
 msgstr ""
 
-#: templates/part.contact.php:20
+#: templates/part.contact.php:21
 msgid "Upload new photo"
 msgstr ""
 
-#: templates/part.contact.php:21
+#: templates/part.contact.php:22
 msgid "Select photo from ownCloud"
 msgstr ""
 
-#: templates/part.contact.php:34
+#: templates/part.contact.php:35
 msgid "Format custom, Short name, Full name, Reverse or Reverse with comma"
 msgstr ""
 
-#: templates/part.contact.php:35
+#: templates/part.contact.php:36
 msgid "Edit name details"
 msgstr "編輯姓名詳細資訊"
 
-#: templates/part.contact.php:40 templates/part.contact.php:112
+#: templates/part.contact.php:40 templates/part.contact.php:42
+#: templates/part.contact.php:44 templates/part.contact.php:46
+#: templates/part.contact.php:50 templates/settings.php:34
+msgid "Delete"
+msgstr "刪除"
+
+#: templates/part.contact.php:41 templates/part.contact.php:113
 msgid "Nickname"
 msgstr "綽號"
 
-#: templates/part.contact.php:41
+#: templates/part.contact.php:42
 msgid "Enter nickname"
 msgstr "輸入綽號"
 
-#: templates/part.contact.php:42 templates/part.contact.php:118
+#: templates/part.contact.php:43 templates/part.contact.php:119
 msgid "Web site"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "http://www.somesite.com"
 msgstr ""
 
-#: templates/part.contact.php:43
+#: templates/part.contact.php:44
 msgid "Go to web site"
 msgstr ""
 
-#: templates/part.contact.php:45
+#: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
 msgstr "dd-mm-yyyy"
 
-#: templates/part.contact.php:46 templates/part.contact.php:119
+#: templates/part.contact.php:47 templates/part.contact.php:120
 msgid "Groups"
 msgstr "群組"
 
-#: templates/part.contact.php:48
+#: templates/part.contact.php:49
 msgid "Separate groups with commas"
 msgstr "用逗號分隔群組"
 
-#: templates/part.contact.php:49
+#: templates/part.contact.php:50
 msgid "Edit groups"
 msgstr "編輯群組"
 
-#: templates/part.contact.php:62 templates/part.contact.php:76
+#: templates/part.contact.php:63 templates/part.contact.php:77
 msgid "Preferred"
 msgstr "首選"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Please specify a valid email address."
 msgstr "註填入合法的電子郵件住址"
 
-#: templates/part.contact.php:63
+#: templates/part.contact.php:64
 msgid "Enter email address"
 msgstr "輸入電子郵件地址"
 
-#: templates/part.contact.php:67
+#: templates/part.contact.php:68
 msgid "Mail to address"
 msgstr "寄送住址"
 
-#: templates/part.contact.php:68
+#: templates/part.contact.php:69
 msgid "Delete email address"
 msgstr "刪除電子郵件住址"
 
-#: templates/part.contact.php:77
+#: templates/part.contact.php:78
 msgid "Enter phone number"
 msgstr "輸入電話號碼"
 
-#: templates/part.contact.php:81
+#: templates/part.contact.php:82
 msgid "Delete phone number"
 msgstr "刪除電話號碼"
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "View on map"
 msgstr ""
 
-#: templates/part.contact.php:91
+#: templates/part.contact.php:92
 msgid "Edit address details"
 msgstr "電子郵件住址詳細資訊"
 
-#: templates/part.contact.php:102
+#: templates/part.contact.php:103
 msgid "Add notes here."
 msgstr "在這裡新增註解"
 
-#: templates/part.contact.php:109
+#: templates/part.contact.php:110
 msgid "Add field"
 msgstr "新增欄位"
 
-#: templates/part.contact.php:114
+#: templates/part.contact.php:115
 msgid "Phone"
 msgstr "電話"
 
-#: templates/part.contact.php:117
+#: templates/part.contact.php:118
 msgid "Note"
 msgstr "註解"
 
-#: templates/part.contact.php:122
+#: templates/part.contact.php:123
 msgid "Download contact"
 msgstr "下載通訊錄"
 
-#: templates/part.contact.php:123
+#: templates/part.contact.php:124
 msgid "Delete contact"
 msgstr "刪除通訊錄"
 
@@ -800,7 +791,7 @@ msgstr "顯示名稱"
 msgid "Active"
 msgstr "作用中"
 
-#: templates/part.editaddressbook.php:29
+#: templates/part.editaddressbook.php:29 templates/settings.php:45
 msgid "Save"
 msgstr "儲存"
 
@@ -808,7 +799,7 @@ msgstr "儲存"
 msgid "Submit"
 msgstr "提出"
 
-#: templates/part.editaddressbook.php:30
+#: templates/part.editaddressbook.php:30 templates/settings.php:46
 msgid "Cancel"
 msgstr "取消"
 
@@ -832,15 +823,15 @@ msgstr ""
 msgid "Importing contacts"
 msgstr ""
 
-#: templates/part.no_contacts.php:2
+#: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
 msgstr ""
 
-#: templates/part.no_contacts.php:4
+#: templates/part.no_contacts.php:5
 msgid "Add contact"
 msgstr ""
 
-#: templates/part.no_contacts.php:5
+#: templates/part.no_contacts.php:6
 msgid "Configure addressbooks"
 msgstr ""
 
@@ -872,6 +863,34 @@ msgstr ""
 msgid "iOS/OS X"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Read only vCard directory link(s)"
+#: templates/settings.php:20
+msgid "Show CardDav link"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Show read-only VCF link"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Download"
+msgstr "下載"
+
+#: templates/settings.php:31
+msgid "Edit"
+msgstr "編輯"
+
+#: templates/settings.php:41
+msgid "New Address Book"
+msgstr "新電話簿"
+
+#: templates/settings.php:42
+msgid "Name"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Description"
+msgstr ""
+
+#: templates/settings.php:51
+msgid "More..."
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 9cc98c4b811d60b8d966436be584a23b87440d5d..932959583c3b14468a426ed427167ecf54e76ab1 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/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-31 22:53+0200\n"
-"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:03+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -38,10 +38,6 @@ msgstr ""
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:203
-msgid "Error loading script for the settings"
-msgstr ""
-
 #: js/js.js:573
 msgid "January"
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 5e9690d52b65d5772ad2d37950cf80dcd1e1657d..2a5571a381c957baf281eb08ae7ce2798a173d68 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 00:02+0000\n"
+"POT-Creation-Date: 2012-08-02 02:02+0200\n"
+"PO-Revision-Date: 2012-08-02 00:04+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"
@@ -202,7 +202,7 @@ msgstr "預設容量限制"
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:80
+#: templates/users.php:80 templates/users.php:112
 msgid "SubAdmin"
 msgstr ""
 
@@ -210,10 +210,6 @@ msgstr ""
 msgid "Quota"
 msgstr "容量限制"
 
-#: templates/users.php:112
-msgid "SubAdmin for ..."
-msgstr ""
-
 #: templates/users.php:145
 msgid "Delete"
 msgstr "刪除"
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index dae698dbdea885eb140229e00107372f26377e04..2917f8a84c4b77ee34ff32ccc39cfd65fafc1ad9 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -47,6 +47,5 @@
 "Other" => "Altre",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
-"SubAdmin for ..." => "SubAdmin per a ...",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 010146283fbeeb2035aa7b52ba66a6eea5e503a3..5610a4ec03a0aa5ead4f0415a447f288fe1779f6 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -47,6 +47,5 @@
 "Other" => "Andere",
 "SubAdmin" => "Unteradministrator",
 "Quota" => "Quota",
-"SubAdmin for ..." => "Unteradministrator für...",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index c2340c1641d552bc127ce8d8d4daca55dafb7d54..c0ab65a81a2f61a80db3f68a48661703b0906737 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -47,6 +47,5 @@
 "Other" => "Άλλα",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Σύνολο χώρου",
-"SubAdmin for ..." => "SubAdmin για ...",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index ad599402d30a2f94bc391a3d07353ed490881fae..687c21259f00f7833753d57e1680b44af395d3ef 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -47,6 +47,5 @@
 "Other" => "Otro",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Cuota",
-"SubAdmin for ..." => "SubAdmin para ...",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 1e8379b752d38157732318bd19aedeece154ab1b..009cd1a8a892e324d2d3c37e19db49b6826a30fd 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -3,11 +3,13 @@
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
+"Authentication error" => "Autentifikazio errorea",
 "Language changed" => "Hizkuntza aldatuta",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
+"Security Warning" => "Segurtasun abisua",
 "Log" => "Egunkaria",
 "More" => "Gehiago",
 "Add your App" => "Gehitu zure aplikazioa",
@@ -43,6 +45,7 @@
 "Create" => "Sortu",
 "Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 87f75a2015fb1fae77e1f512dd20434ecc0e4f8f..8ddfcc7f97a344deb4e3f8385e2bde88e2dbc83f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -47,6 +47,5 @@
 "Other" => "Autre",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Quota",
-"SubAdmin for ..." => "SubAdmin pour ...",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 1ef27ce331dd0f133f2327584ea7e6028aeeb198..966f2b7f176c2ff391070ff57bf9eb15eb3b80f5 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -47,6 +47,5 @@
 "Other" => "Altro",
 "SubAdmin" => "SubAdmin",
 "Quota" => "Quote",
-"SubAdmin for ..." => "SubAdmin per...",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 7050b85762f614550e0d13ba469939a2b542189f..f215e5b91081b682dc452a0bccadcb830ae5f1bf 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -3,11 +3,13 @@
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
+"Authentication error" => "認証エラー",
 "Language changed" => "言語が変更されました",
 "Disable" => "無効",
 "Enable" => "有効",
 "Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
+"Security Warning" => "セキュリティ警告",
 "Log" => "ログ",
 "More" => "もっと",
 "Add your App" => "アプリを追加",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 59185d68e3766faa4762bf7750a2741fdad15621..c000bc4150f99e0d2ef3e138809c01720b7c00a1 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -9,6 +9,7 @@
 "Enable" => "Włączone",
 "Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
+"Security Warning" => "Ostrzeżenia bezpieczeństwa",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",
@@ -44,6 +45,7 @@
 "Create" => "Utwórz",
 "Default Quota" => "Domyślny udział",
 "Other" => "Inne",
+"SubAdmin" => "SubAdmin",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index f1ac1f16424a257f7fd982ee60a601c6a0e2e079..99c6d9d484a9b0f15b2d8f13ef9a3fd8fd6f23e9 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -47,6 +47,5 @@
 "Other" => "Drugo",
 "SubAdmin" => "PodSkrbnik",
 "Quota" => "Količinska omejitev",
-"SubAdmin for ..." => "PodSkrbnik za ...",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index b942b86ed2eafcaf61f59e82694b45420c74e6c9..9df4ef257f7757bbea6630bbf9e0304a0e56949e 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -47,6 +47,5 @@
 "Other" => "Annat",
 "SubAdmin" => "Underadministratör",
 "Quota" => "Kvot",
-"SubAdmin for ..." => "Underadministratör för ...",
 "Delete" => "Ta bort"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e4907dfba98093a1637075913df389d3ecdd7d18..e3ba426f5f1375d3562076c80c29d5ceb4b6a7a8 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -47,6 +47,5 @@
 "Other" => "Diğer",
 "SubAdmin" => "Alt Yönetici",
 "Quota" => "Kota",
-"SubAdmin for ..." => "Alt yönetici için ...",
 "Delete" => "Sil"
 );